update

main.go

@@ -29,34 +29,23 @@ func main() {
 	// seed the prng
 	rand.Seed(time.Now().UnixNano())
 
-	server := NewVPNServer(config.GetString("config.openvpnPort", "127.0.0.01:5000"))
+	server := NewVPNServer(config.GetString("config.openvpnPort", "127.0.0.01:5000"), *debug)
 
-	server.syslog = false
 	if *logToSyslog {
 		log.SetFlags(0)
-		server.syslog = true
-		logWriter, e := syslog.New(syslog.LOG_NOTICE, "vpnauth")
+		logWriter, e := syslog.New(syslog.LOG_NOTICE, "vpncontrol")
 		if e == nil {
 			log.SetOutput(logWriter)
 			defer logWriter.Close()
 		}
 	}
 
-	server.debug = false
-	if *debug {
-		server.debug = true
-	}
-
-	log.Println(getServerList("https://www.expressvpn.com/vpn-server"))
-
 	// time to start the listeners
-	go server.Run()
-	NewHTTPServer(
+	go NewHTTPServer(
 		config.GetString("config.http.port", "127.0.0.01:8080"),
-		config.GetString("config.http.key", ""),
-		config.GetString("config.http.cert", ""),
-		config.GetString("config.http.ca", ""),
-		config.GetString("config.http.startAuth", "CORP"),
-		parseConfigArray(config, "config.http.reqAuth"),
 		server)
+	server.Run()
+
+	// server.Run() should never end
+	os.Exit(1)
 }