From 8920c2af029a930bf904685c606285da17de9e9d Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Thu, 21 Apr 2016 21:53:34 +0100 Subject: Some small fixes. Rename 'GoogleOpts' to 'ProviderOpts'. Rename Principals to AdditionalPrincipals to match the config option. --- server/config/config.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'server/config') diff --git a/server/config/config.go b/server/config/config.go index 4011d82..49b0f2e 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -24,16 +24,16 @@ type Auth struct { OauthClientSecret string `mapstructure:"oauth_client_secret"` OauthCallbackURL string `mapstructure:"oauth_callback_url"` Provider string `mapstructure:"provider"` - GoogleOpts map[string]interface{} `mapstructure:"google_opts"` + ProviderOpts map[string]interface{} `mapstructure:"provider_opts"` JWTSigningKey string `mapstructure:"jwt_signing_key"` } // SSH holds the configuration specific to signing ssh keys. type SSH struct { - SigningKey string `mapstructure:"signing_key"` - Principals []string `mapstructure:"additional_principals"` - MaxAge string `mapstructure:"max_age"` - Permissions []string `mapstructure:"permissions"` + SigningKey string `mapstructure:"signing_key"` + AdditionalPrincipals []string `mapstructure:"additional_principals"` + MaxAge string `mapstructure:"max_age"` + Permissions []string `mapstructure:"permissions"` } // ReadConfig parses a JSON configuration file into a Config struct. -- cgit v1.2.3