Merge pull request #15 from getlantern/issue12

serve command line options from config file

Author: uaalto

README.md

@@ -13,6 +13,18 @@ These are Lantern-specific middleware components for the HTTP Proxy in Go:
 * Custom responses for mimicking Apache in certain cases
 
 
+### Usage
+
+Build it with `go build`.
+
+To get list of the command line options, please run `http-proxy-lantern -help`.
+
+`config.ini.default` also has the list of options, make a copy (say, `config.ini`) and tweak it as you wish, then run the proxy with
+
+```
+http-proxy-lantern -config config.ini
+```
+
 ### Testing with Lantern extensions and configuration
 
 ### Run tests

config.ini.default

@@ -0,0 +1,11 @@
+addr = :8080  # Address to listen
+https = false # Use TLS for client to proxy communication
+idleclose = 30  # Time in seconds that an idle connection will be allowed before closing it
+key =   # Private key file name
+cert =   # Certificate file name
+token =   # Lantern token
+logglytoken =   # Token used to report to loggly.com, not reporting if empty
+maxconns = 0  # Max number of simultaneous connections allowed connections
+enablereports = false  # Enable stats reporting
+pprofaddr =   # pprof address to listen on, not activate pprof if empty
+help = false  # Get usage help

http_proxy.go

@@ -8,6 +8,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/vharitonsky/iniflags"
+
 	"github.com/getlantern/golog"
 	"github.com/getlantern/measured"
 
@@ -47,7 +49,7 @@ var (
 func main() {
 	var err error
 
-	_ = flag.CommandLine.Parse(os.Args[1:])
+	iniflags.Parse()
 	if *help {
 		flag.Usage()
 		return