set user/pass via env

Author: jpillora

agent/agent.go

@@ -72,7 +72,6 @@ func Run(c Config) error {
 	//custom middleware stack
 	//3. basic-auth middleware
 	if c.User != "" || c.Pass != "" {
-		log.Printf("cookieauth")
 		h = cookieauth.Wrap(h, c.User, c.Pass)
 	}
 	//2. ipfilter middlware

agent/config.go

@@ -27,16 +27,16 @@ const (
 
 type Config struct {
 	Host               string   `help:"listening interface"`
-	Port               int      `help:"listening port"`
-	User               string   `help:"basic auth username"`
-	Pass               string   `help:"basic auth password"`
+	Port               int      `help:"listening port" env:"PORT"`
+	User               string   `help:"basic auth username" env:"USER"`
+	Pass               string   `help:"basic auth password" env:"PASS"`
 	AllowedIPs         []string `opts:"-"`
 	ProgramArgs        []string `type:"arglist" min:"1" name:"args" help:"args can be either a command with arguments or a webproc file"`
 	Log                Log      `opts:"-"`
 	OnExit             OnExit   `help:"process exit action" default:"proxy"`
 	ConfigurationFiles []string `name:"config" type:"commalist" help:"comma-separated list of configuration files"`
-	VerifyProgramArgs  []string `name:"verify" type:"spacelist" help:"command used to verify configuration"`
-	RestartTimeout     Duration `opts:"-"`
+	// VerifyProgramArgs  []string `name:"verify" type:"spacelist" help:"command used to verify configuration"`
+	RestartTimeout Duration `opts:"-"`
 }
 
 func LoadConfig(path string, c *Config) error {

default.toml

@@ -33,9 +33,9 @@ OnExit = "proxy"
 # For example, dnsmasq would include "/etc/dnsmasq.conf"
 ConfigurationFiles = []
 
-# When provided, this command will be used verify all configuration changes
+# TODO When provided, this command will be used verify all configuration changes
 # before restarting the process. An exit code 0 means valid, otherwise it's assumed invalid.
-VerifyProgramArgs = []
+# VerifyProgramArgs = []
 
 # After the restart signal (SIGINT) has been sent, webproc will wait for RestartTimeout before
 # forcibly restarting the process (SIGKILL).