Added support for default and override config.

Godeps

@@ -6,7 +6,7 @@ github.com/longsleep/pkac						0.0.1
 github.com/satori/go.uuid						afe1e2ddf0f05b7c29d388a3f8e76cb15c2231ca
 github.com/strukturag/goacceptlanguageparser	goacceptlanguageparser_v100
 github.com/strukturag/httputils					httputils_v012
-github.com/strukturag/phoenix					phoenix_v0133
+github.com/strukturag/phoenix					phoenix_v100
 github.com/strukturag/sloth						v0.9.2
 github.com/dlintw/goconf						dcc070983490608a14480e3bf943bad464785df5
 github.com/nats-io/nats							v1.1.6

src/app/spreed-webrtc-server/main.go

@@ -475,7 +475,9 @@ func runner(runtime phoenix.Runtime) error {
 }
 
 func boot() error {
+	defaultConfigPath := flag.String("dc", "", "Default configuration file.")
 	configPath := flag.String("c", defaultConfig, "Configuration file.")
+	overrideConfigPath := flag.String("oc", "", "Override configuration file.")
 	logPath := flag.String("l", "", "Log file, defaults to stderr.")
 	showVersion := flag.Bool("v", false, "Display version number and exit.")
 	memprofile := flag.String("memprofile", "", "Write memory profile to this file.")
@@ -492,7 +494,9 @@ func boot() error {
 	}
 
 	return phoenix.NewServer("server", version).
+		DefaultConfig(defaultConfigPath).
 		Config(configPath).
+		OverrideConfig(overrideConfigPath).
 		Log(logPath).
 		CpuProfile(cpuprofile).
 		MemProfile(memprofile).