From ccd14af0c886445745e2262eaf51d3cb3248eac2 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 5 May 2023 21:36:38 -0700 Subject: [PATCH] settings: treat empty environment variables as set (#77) This allows disabling specific options like dns_interface or whois via environment variables. ref: https://github.com/spf13/viper#working-with-environment-variables --- frontend/settings.go | 1 + proxy/settings.go | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/settings.go b/frontend/settings.go index a6bcb59..d18d10a 100644 --- a/frontend/settings.go +++ b/frontend/settings.go @@ -33,6 +33,7 @@ func parseSettings() { viper.AddConfigPath(".") viper.AddConfigPath("/etc/bird-lg") viper.SetConfigName("bird-lg") + viper.AllowEmptyEnv(true) viper.AutomaticEnv() viper.SetEnvPrefix("birdlg") viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_")) diff --git a/proxy/settings.go b/proxy/settings.go index 946744f..0129cc0 100644 --- a/proxy/settings.go +++ b/proxy/settings.go @@ -23,6 +23,7 @@ func parseSettings() { viper.AddConfigPath(".") viper.AddConfigPath("/etc/bird-lg") viper.SetConfigName("bird-lgproxy") + viper.AllowEmptyEnv(true) viper.AutomaticEnv() viper.SetEnvPrefix("birdlg") viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_", ".", "_"))