diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | server/config/config.go | 1 | ||||
| -rw-r--r-- | server/config/config_test.go | 1 | ||||
| -rw-r--r-- | testdata/config.go | 3 |
5 files changed, 13 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 8213639..9067b6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,16 @@ language: go +env: + - GO15VENDOREXPERIMENT=1 + go: + - 1.5.4 - 1.6.2 - tip + +sudo: false +script: + - go build -v ./... + - go test -v ./... + - gofmt -d $(find -type f -name '*.go' -not -path './vendor/*') + - go list ./... |grep -v vendor/ |xargs go vet @@ -62,7 +62,7 @@ docker run -it --rm -p 10000:10000 --name cashier -v $(pwd):/cashier nsheridan/c # Requirements ## Server -Go 1.5+. May work with earlier versions. +Go 1.5 (with `GO15VENDOREXPERIMENT` set) or later. May work with earlier versions. ## Client OpenSSH 5.6 or newer. @@ -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 8922ff6..7598f0a 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 e528e7d..6baf76d 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 a64ebd5..bb2f511 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" } }`) |