# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1535376446 -7200
# Node ID 7e45aaec70818a6f1ce68c98ab5ef681babb3275
# Parent  9b3db1d7a7ebc4f74d16acb0d507d7de03d80b5c
Consolidate configuration parameters.

metamorph-db-user     -> db-user
metamorph-db-password -> db-password

dbhost -> db-host
dbname -> db-name
dbport -> db-port
dbssl  -> db-ssl

diff -r 9b3db1d7a7eb -r 7e45aaec7081 cmd/gemma/geoserver.go
--- a/cmd/gemma/geoserver.go	Mon Aug 27 12:44:07 2018 +0200
+++ b/cmd/gemma/geoserver.go	Mon Aug 27 15:27:26 2018 +0200
@@ -136,8 +136,8 @@
 					{"port", config.DBPort()},
 					{"database", config.DBName()},
 					{"schema", databaseScheme},
-					{"user", config.MetamorphDBUser()},
-					{"passwd", config.MetamorhpDBPassword()},
+					{"user", config.DBUser()},
+					{"passwd", config.DBPassword()},
 					{"dbtype", databaseType},
 					{"Session startup SQL", startupSQL},
 					{"Session close-up SQL", closeupSQL},
@@ -288,7 +288,7 @@
 
 func prepareGeoServer() error {
 
-	if config.MetamorphDBUser() == "" {
+	if config.DBUser() == "" {
 		log.Println("info: Need metamorphic db user to configure GeoServer")
 		return nil
 	}
diff -r 9b3db1d7a7eb -r 7e45aaec7081 example_conf.toml
--- a/example_conf.toml	Mon Aug 27 12:44:07 2018 +0200
+++ b/example_conf.toml	Mon Aug 27 15:27:26 2018 +0200
@@ -19,12 +19,12 @@
 # Database:
 
 # DB connection configuration:
-dbhost = "gemma_db"
-#dbname = "gemma"
-#dbport = 5432
-#dbssl = "prefer"
-metamorph-db-user = "meta_login"
-metamorph-db-password = "geo2Serv"
+db-host = "gemma_db"
+#db-name = "gemma"
+#db-port = 5432
+#db-ssl = "prefer"
+db-user = "meta_login"
+db-password = "geo2Serv"
 
 # ----------------------------------------------------------------------
 # Mail setup:
diff -r 9b3db1d7a7eb -r 7e45aaec7081 pkg/auth/opendb.go
--- a/pkg/auth/opendb.go	Mon Aug 27 12:44:07 2018 +0200
+++ b/pkg/auth/opendb.go	Mon Aug 27 15:27:26 2018 +0200
@@ -45,11 +45,11 @@
 	if m.db != nil {
 		return m.db, nil
 	}
-	user := config.MetamorphDBUser()
+	user := config.DBUser()
 	if user == "" {
 		return nil, ErrNoMetamorphUser
 	}
-	db, err := OpenDB(user, config.MetamorhpDBPassword())
+	db, err := OpenDB(user, config.DBPassword())
 	if err != nil {
 		return nil, err
 	}
diff -r 9b3db1d7a7eb -r 7e45aaec7081 pkg/config/config.go
--- a/pkg/config/config.go	Mon Aug 27 12:44:07 2018 +0200
+++ b/pkg/config/config.go	Mon Aug 27 15:27:26 2018 +0200
@@ -18,17 +18,18 @@
 
 func ConfigFile() string { return configFile }
 
-func DBHost() string       { return viper.GetString("dbhost") }
-func DBPort() uint         { return uint(viper.GetInt32("dbport")) }
-func DBName() string       { return viper.GetString("dbname") }
-func DBSSLMode() string    { return viper.GetString("dbssl") }
+func DBHost() string     { return viper.GetString("db-host") }
+func DBPort() uint       { return uint(viper.GetInt32("db-port")) }
+func DBName() string     { return viper.GetString("db-name") }
+func DBUser() string     { return viper.GetString("db-user") }
+func DBPassword() string { return viper.GetString("db-password") }
+func DBSSLMode() string  { return viper.GetString("db-ssl") }
+
 func SessionStore() string { return viper.GetString("sessions") }
-func Web() string          { return viper.GetString("web") }
-func WebHost() string      { return viper.GetString("host") }
-func WebPort() uint        { return uint(viper.GetInt32("port")) }
 
-func MetamorphDBUser() string     { return viper.GetString("metamorph-db-user") }
-func MetamorhpDBPassword() string { return viper.GetString("metamorph-db-password") }
+func Web() string     { return viper.GetString("web") }
+func WebHost() string { return viper.GetString("host") }
+func WebPort() uint   { return uint(viper.GetInt32("port")) }
 
 func MailHost() string     { return viper.GetString("mail-host") }
 func MailPort() uint       { return uint(viper.GetInt32("mail-port")) }
@@ -116,10 +117,12 @@
 		vbind(name)
 	}
 
-	strP("dbhost", "H", "localhost", "host of the database")
-	uiP("dbport", "P", 5432, "port of the database")
-	strP("dbname", "d", "gemma", "name of the database")
-	strP("dbssl", "S", "prefer", "SSL mode of the database")
+	strP("db-host", "H", "localhost", "host of the database")
+	uiP("db-port", "P", 5432, "port of the database")
+	strP("db-name", "d", "gemma", "name of the database")
+	str("db-user", "meta_login", "Metamorphic database user")
+	str("db-password", "", "Metamorphic database user password")
+	strP("db-ssl", "S", "prefer", "SSL mode of the database")
 
 	strP("sessions", "s", "", "path to the sessions file")
 
@@ -129,7 +132,8 @@
 
 	str("mail-host", "localhost", "server to send mail with")
 	ui("mail-port", 465, "port of server to send mail with")
-	str("mail-user", "gemma", "user to authenticate against mail-host. Leave empty for trying to send without auth.")
+	str("mail-user", "gemma", "user to authenticate against mail-host.\n"+
+		"Leave empty for trying to send without auth.")
 	str("mail-password", "", "password of user to send mail with")
 	str("mail-from", "noreply@localhost", "from line of mails")
 	str("mail-helo", "localhost", "name of server to send mail from.")
@@ -140,9 +144,6 @@
 	str("geoserver-user", "admin", "GeoServer user")
 	str("geoserver-password", "geoserver", "GeoServer password")
 
-	str("metamorph-db-user", "", "Metamorphic database user")
-	str("metamorph-db-password", "", "Metamorphic database user password")
-
 	str("proxy-key", "", `signing key for proxy URLs. Defaults to random key.`)
 	str("proxy-prefix", "", `URL prefix of proxy. Defaults to "http://${web-host}:${web-port}"`)