Merge pull request #143 from jaredbischof/master

Updating config file.

shock-server.conf.template

@@ -1,3 +1,10 @@
+[Address]
+# IP and port for api
+# Note: use of port 80 may require root access
+# 0.0.0.0 will bind Shock to all IP's
+api-ip=0.0.0.0
+api-port=7445
+
 [Admin]
 [email protected]
 
@@ -10,32 +17,17 @@ create-user=false
 
 [Auth]
 # defaults to local user management with basis auth
-basic_auth=true
+basic=true
 # comment line above and uncomment below to use Globus Online as auth provider
 #globus_token_url=https://nexus.api.globusonline.org/goauth/token?grant_type=client_credentials
 #globus_profile_url=https://nexus.api.globusonline.org/users
 
-[Directories]
-# See documentation for details of deploying Shock
-site=/usr/local/shock/site
-data=/usr/local/shock
-logs=/var/log/shock
-
-# Comma delimited search path available for remote path uploads. Only remote paths that prefix 
-# match one of the following will be allowed. Note: poor choices can result in security concerns.
-local_paths=N/A
-
 [External]
 site-url=http://localhost
 
 [Log]
 perf_log=false
 
-[SSL]
-enable=false
-#key=<path_to_key_file>
-#cert=<path_to_cert_file>
-
 [Mongodb]
 # Mongodb configuration
 # Hostnames and ports hosts=host1[,host2:port,...,hostN]
@@ -49,13 +41,18 @@ password=
 # key=unique:true/false[,dropDups:true/false][,sparse:true/false]
 id=unique:true
 
-[Address]
-# IP and port for api
-# Note: use of port 80 may require root access
-# 0.0.0.0 will bind Shock to all IP's
-api-ip=0.0.0.0
-api-port=7445
+[Paths]
+# See documentation for details of deploying Shock
+site=/usr/local/shock/site
+data=/usr/local/shock
+logs=/var/log/shock
+local_paths=
+pidfile=
 
 [Runtime]
 GOMAXPROCS=
-pidfile=
+
+[SSL]
+enable=false
+#key=<path_to_key_file>
+#cert=<path_to_cert_file>

shock-server/conf/conf.go

@@ -73,17 +73,16 @@ func Initialize() {
 
 	// Admin
 	Conf["admin-email"], _ = c.String("Admin", "email")
-	Conf["admin-secret"], _ = c.String("Admin", "secretkey")
 
-	// Directories
-	Conf["site-path"], _ = c.String("Directories", "site")
-	Conf["data-path"], _ = c.String("Directories", "data")
-	Conf["logs-path"], _ = c.String("Directories", "logs")
-	Conf["local-paths"], _ = c.String("Directories", "local_paths")
+	// Paths
+	Conf["site-path"], _ = c.String("Paths", "site")
+	Conf["data-path"], _ = c.String("Paths", "data")
+	Conf["logs-path"], _ = c.String("Paths", "logs")
+	Conf["local-paths"], _ = c.String("Paths", "local_paths")
+	Conf["pidfile"], _ = c.String("Paths", "pidfile")
 
 	// Runtime
 	Conf["GOMAXPROCS"], _ = c.String("Runtime", "GOMAXPROCS")
-	Conf["pidfile"], _ = c.String("Runtime", "pidfile")
 
 	// Mongodb
 	Conf["mongodb-hosts"], _ = c.String("Mongodb", "hosts")
@@ -136,7 +135,6 @@ func Bool(s string) bool {
 
 // Print prints the configuration loads to stdout
 func Print() {
-	fmt.Printf("##### Admin #####\nemail:\t%s\nsecretkey:\t%s\n\n", Conf["admin-email"], Conf["admin-secret"])
 	fmt.Printf("####### Anonymous ######\nread:\t%s\nwrite:\t%s\ncreate-user:\t%s\n\n", Conf["anon-read"], Conf["anon-write"], Conf["anon-user"])
 	if Conf["auth-type"] == "basic" {
 		fmt.Printf("##### Auth #####\ntype:\tbasic\n\n")