From e158191e74d04c1081687348ed79fcbb61cd9ba5 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sun, 29 May 2016 00:27:36 +0100
Subject: [PATCH] Remove unneeded template_dir
---
README.md | 1 -
server/config/config.go | 1 -
server/config/config_test.go | 1 -
testdata/config.go | 3 +--
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/README.md b/README.md
index e22e1df8..e0276f5f 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 8922ff63..7598f0a9 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 e528e7de..6baf76d2 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 a64ebd55..bb2f5111 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"
}
}`)
--
GitLab