diff --git a/README.md b/README.md index e22e1df8533e086107f2dea2b5f17ce738b2a917..e0276f5f0f5feb2cb20e64657db8e734a6b37618 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,6 @@ Configuration is divided into three sections: `server`, `auth`, and `ssh`. - `tls_cert` : string. Path to the TLS cert. - `port` : int. Port to listen on. - `cookie_secret`: string. Authentication key for the session cookie. -- `template_dir`: string. Path to html template directory. At present only 'token.html' is required. ### auth - `provider` : string. Name of the oauth provider. At present the only valid value is "google". diff --git a/server/config/config.go b/server/config/config.go index 8922ff63396a04a7c3d2f307607021f3092ef181..7598f0a909daf7e7861dc50406a3d2bc04601428 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -20,7 +20,6 @@ type Server struct { TLSCert string `mapstructure:"tls_cert"` Port int `mapstructure:"port"` CookieSecret string `mapstructure:"cookie_secret"` - TemplateDir string `mapstructure:"template_dir"` } // Auth holds the configuration specific to the OAuth provider. diff --git a/server/config/config_test.go b/server/config/config_test.go index e528e7debf1a09a76cb1eed257cf4a5cd8d4660b..6baf76d2a5f699e5a4b99d3fc75d8f06f390c056 100644 --- a/server/config/config_test.go +++ b/server/config/config_test.go @@ -22,7 +22,6 @@ func TestServerConfig(t *testing.T) { a.Equal(server.TLSCert, "server.crt") a.Equal(server.Port, 443) a.Equal(server.CookieSecret, "supersecret") - a.Equal(server.TemplateDir, "templates") } func TestAuthConfig(t *testing.T) { diff --git a/testdata/config.go b/testdata/config.go index a64ebd55218d659d8bc37ba17145ca585b42236c..bb2f5111dd88a44ffc89c98ddb8f6b60111d9213 100644 --- a/testdata/config.go +++ b/testdata/config.go @@ -6,8 +6,7 @@ var ServerConfig = []byte(`{ "tls_key": "server.key", "tls_cert": "server.crt", "port": 443, - "cookie_secret": "supersecret", - "template_dir": "templates" + "cookie_secret": "supersecret" } }`)