Merge branch 'execute-in-chroot'

app.go

@@ -109,11 +109,11 @@ func (a *theApp) Run() {
 	}
 	// Listen for HTTP proxy requests
-	if a.listenProxy != 0 {
+	if a.ListenProxy != 0 {
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			err := listenAndServe(a.listenProxy, a.ServeProxy, a.HTTP2, nil)
+			err := listenAndServe(a.ListenProxy, a.ServeProxy, a.HTTP2, nil)
 			if err != nil {
 				log.Fatal(err)
 			}

app_config.go

 package main
 type appConfig struct {
-	Domain string
+	Domain          string
 	RootCertificate []byte
 	RootKey         []byte
-	ListenHTTP  uintptr
-	ListenHTTPS uintptr
-	listenProxy uintptr
-	HTTP2        bool
-	RedirectHTTP bool
+	ListenHTTP      uintptr
+	ListenHTTPS     uintptr
+	ListenProxy     uintptr
+	HTTP2           bool
+	RedirectHTTP    bool
 }

daemon.go

@@ -199,7 +199,7 @@ func daemonize(config appConfig, uid, gid uint) {
 	// Create a new file and store the FD
 	daemonUpdateFd(cmd, &config.ListenHTTP)
 	daemonUpdateFd(cmd, &config.ListenHTTPS)
-	daemonUpdateFd(cmd, &config.listenProxy)
+	daemonUpdateFd(cmd, &config.ListenProxy)
 	// Start the process
 	if err = cmd.Start(); err != nil {

domains.go

@@ -125,12 +125,15 @@ func watchDomains(rootDomain string, updater domainsUpdater, interval time.Durat
 	lastUpdate := []byte("no-update")
 	for {
+		// Read the update file
 		update, err := ioutil.ReadFile(".update")
+		if err != nil && !os.IsNotExist(err) {
+			log.Println("Failed to read update timestamp:", err)
+		}
+
+		// If it's the same ignore
 		if bytes.Equal(lastUpdate, update) {
-			if err != nil {
-				log.Println("Failed to read update timestamp:", err)
-				time.Sleep(interval)
-			}
+			time.Sleep(interval)
 			continue
 		}
 		lastUpdate = update

main.go

@@ -15,7 +15,7 @@ var VERSION = "dev"
 var REVISION = "HEAD"
 func appMain() {
-	var listenHTTP = flag.String("listen-http", ":80", "The address to listen for HTTP requests")
+	var listenHTTP = flag.String("listen-http", "", "The address to listen for HTTP requests")
 	var listenHTTPS = flag.String("listen-https", "", "The address to listen for HTTPS requests")
 	var listenProxy = flag.String("listen-proxy", "", "The address to listen for proxy requests")
 	var pagesRootCert = flag.String("root-cert", "", "The default path to file certificate to serve static pages")
@@ -63,7 +63,7 @@ func appMain() {
 	if *listenProxy != "" {
 		var l net.Listener
-		l, config.ListenHTTPS = createSocket(*listenProxy)
+		l, config.ListenProxy = createSocket(*listenProxy)
 		defer l.Close()
 	}