daemon option works correctly

3 files changed, 13 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index ae508bb..cdec0f0 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ sudo: build
 debian:
 	go-deb --repo go.wit.com/lib/daemons/gus
 
+daemon:
+	./gus --daemon --no-gui --config /etc/gus/gus.text
+
 goimports:
 	goimports -w *.go
 
diff --git a/gus.service b/gus.service
index eec34ff..8140f94 100644
--- a/gus.service
+++ b/gus.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=root
 Type=simple
-ExecStart=/usr/bin/zood --daemon
+ExecStart=/usr/bin/gus --daemon --no-gui
 Restart=always
 RestartSec=5s
 KillMode=process
diff --git a/main.go b/main.go
index 889df91..65f6132 100644
--- a/main.go
+++ b/main.go
@@ -53,24 +53,24 @@ func main() {
 	if argv.Daemon {
 		// turn off timestamps for STDOUT (systemd adds them)
 		log.DaemonMode(true)
+		startGus()
 		startHTTP()
 		os.Exit(0)
 	}
 
 	if gui.NoGui() {
-		all := me.portmaps.All()
-		for all.Scan() {
-			pm := all.Next()
-			if !pm.Enabled {
-				continue
-			}
-			log.Info("portmap enabled for port", pm.Localport, "to", pm.Dest)
-			go gus3000(pm)
-		}
+		startGus()
 		startHTTP()
 		os.Exit(0)
 	}
 
+	startGus()
+	// go NewWatchdog()
+	go startHTTP()
+	doGui()
+}
+
+func startGus() {
 	all := me.portmaps.All()
 	for all.Scan() {
 		pm := all.Next()
@@ -80,9 +80,6 @@ func main() {
 		log.Info("portmap enabled for port", pm.Localport, "to", pm.Dest)
 		go gus3000(pm)
 	}
-	// go NewWatchdog()
-	go startHTTP()
-	doGui()
 }
 
 // func doME(pm *Portmap, gus listener.Accept) {