From f2ac0d970c0987c4ba70a111a5f52a493f712c91 Mon Sep 17 00:00:00 2001
From: Niall Sheridan <nsheridan@gmail.com>
Date: Sat, 21 May 2016 21:35:41 +0100
Subject: Remove database config. Not needed.

---
 server/config/config.go      | 16 +++-------------
 server/config/config_test.go | 15 ---------------
 2 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'server')

diff --git a/server/config/config.go b/server/config/config.go
index bf5bfc7..7598f0a 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -8,10 +8,9 @@ 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"`
-	Database Database `mapstructure:"database"`
+	Server Server `mapstructure:"server"`
+	Auth   Auth   `mapstructure:"auth"`
+	SSH    SSH    `mapstructure:"ssh"`
 }
 
 // Server holds the configuration specific to the web server and sessions.
@@ -23,15 +22,6 @@ 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 067b0dc..6baf76d 100644
--- a/server/config/config_test.go
+++ b/server/config/config_test.go
@@ -57,18 +57,3 @@ 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")
-}
-- 
cgit v1.2.3