aboutsummaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorNiall Sheridan <nsheridan@gmail.com>2016-05-09 22:21:04 +0100
committerNiall Sheridan <nsheridan@gmail.com>2016-05-09 22:21:04 +0100
commit9e5a1e1d458ebf60cf692c5f58651aa182d4518d (patch)
treea259334b44414472b9ba5d171153a22446384f9c /server
parent8b50e3634a1a278119005ef0986b4a6d23065fc2 (diff)
Placeholder for database config.
Diffstat (limited to 'server')
-rw-r--r--server/config/config.go16
-rw-r--r--server/config/config_test.go15
2 files changed, 28 insertions, 3 deletions
diff --git a/server/config/config.go b/server/config/config.go
index 21fba94..3d12665 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -8,9 +8,10 @@ import (
// Config holds the values from the json config file.
type Config struct {
- Server Server `mapstructure:"server"`
- Auth Auth `mapstructure:"auth"`
- SSH SSH `mapstructure:"ssh"`
+ Server Server `mapstructure:"server"`
+ Auth Auth `mapstructure:"auth"`
+ SSH SSH `mapstructure:"ssh"`
+ Database Database `mapstructure:"database"`
}
// Server holds the configuration specific to the web server and sessions.
@@ -22,6 +23,15 @@ type Server struct {
CookieSecret string `mapstructure:"cookie_secret"`
}
+// Database holds the configuration specific to database functions.
+type Database struct {
+ DbType string `mapstructure:"dbtype"`
+ Host string `mapstructure:"host"`
+ User string `mapstructure:"user"`
+ Password string `mapstructure:"password"`
+ DB string `mapstructure:"db"`
+}
+
// Auth holds the configuration specific to the OAuth provider.
type Auth struct {
OauthClientID string `mapstructure:"oauth_client_id"`
diff --git a/server/config/config_test.go b/server/config/config_test.go
index 70436d5..f97961a 100644
--- a/server/config/config_test.go
+++ b/server/config/config_test.go
@@ -58,3 +58,18 @@ func TestSSHConfig(t *testing.T) {
}
a.Equal(d.Hours(), float64(720))
}
+
+func TestDatabaseConfig(t *testing.T) {
+ a := assert.New(t)
+ c, err := ReadConfig(bytes.NewBuffer(testdata.Database))
+ if err != nil {
+ t.Fatal(err)
+ }
+ d := c.Database
+ a.IsType(d, Database{})
+ a.Equal(d.User, "user")
+ a.Equal(d.Password, "password")
+ a.Equal(d.Host, "localhost")
+ a.Equal(d.DbType, "mongo")
+ a.Equal(d.DB, "dbname")
+}