From 4dfb29f2e07fe6fb90544ba66cf0a3df187072d9 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Sat, 28 May 2016 22:30:42 +0100 Subject: Use flags as defaults, allow them to override config file --- cmd/cashier/config.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'cmd/cashier/config.go') diff --git a/cmd/cashier/config.go b/cmd/cashier/config.go index 1196cbd..eed98e1 100644 --- a/cmd/cashier/config.go +++ b/cmd/cashier/config.go @@ -1,6 +1,7 @@ package main import ( + "github.com/spf13/pflag" "github.com/spf13/viper" ) @@ -13,10 +14,10 @@ type config struct { } func setDefaults() { - viper.SetDefault("ca", "http://localhost:10000") - viper.SetDefault("key_type", "rsa") - viper.SetDefault("key_size", 2048) - viper.SetDefault("validity", "24h") + viper.BindPFlag("ca", pflag.Lookup("ca")) + viper.BindPFlag("key_type", pflag.Lookup("key_type")) + viper.BindPFlag("key_size", pflag.Lookup("key_size")) + viper.BindPFlag("validity", pflag.Lookup("validity")) viper.SetDefault("validateTLSCertificate", true) } -- cgit v1.2.3