)
var (
- defaultConfigPath = "/etc/arvados/keep-web/config.json"
+ defaultConfigPath = "/etc/arvados/keep-web/keep-web.yml"
)
// Config specifies server configuration.
var configPath string
deprecated := " (DEPRECATED -- use config file instead)"
flag.StringVar(&configPath, "config", defaultConfigPath,
- "`path` to json configuration file")
+ "`path` to JSON or YAML configuration file")
flag.StringVar(&cfg.Listen, "listen", "",
"address:port or :port to listen on"+deprecated)
flag.BoolVar(&cfg.deprecatedAllowAnonymous, "allow-anonymous", false,
"Only serve attachments at the given `host:port`"+deprecated)
flag.BoolVar(&cfg.TrustAllContent, "trust-all-content", false,
"Serve non-public content from a single origin. Dangerous: read docs before using!"+deprecated)
+ dumpConfig := flag.Bool("dump-config", false,
+ "write current configuration to stdout and exit")
flag.Usage = usage
flag.Parse()
cfg.AnonymousTokens = []string{os.Getenv("ARVADOS_API_TOKEN")}
}
+ if *dumpConfig {
+ log.Fatal(config.DumpAndExit(cfg))
+ }
+
os.Setenv("ARVADOS_API_HOST", cfg.Client.APIHost)
srv := &server{Config: cfg}
if err := srv.Start(); err != nil {
log.Fatal(err)
}
- if _, err := daemon.SdNotify("READY=1"); err != nil {
+ if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
log.Printf("Error notifying init daemon: %v", err)
}
log.Println("Listening at", srv.Addr)