revel/config#4 related changes applied here

jeevatkm · jeevatkm · commit f3a422c22899 · 2016-06-04T13:34:38.000-07:00
diff --git a/revel.go b/revel.go
@@ -45,12 +45,18 @@ var (
 	// Revel installation details
 	RevelPath string // e.g. "/Users/robfig/gocode/src/revel"
 
-	// Where to look for templates and configuration.
-	// Ordered by priority.  (Earlier paths take precedence over later paths.)
+	// Where to look for templates
+	// Ordered by priority. (Earlier paths take precedence over later paths.)
 	CodePaths     []string
-	ConfPaths     []string
 	TemplatePaths []string
 
+	// ConfPaths where to look for configurations
+	// Config load order
+	// 1. framework (revel/conf/*)
+	// 2. application (conf/*)
+	// 3. user supplied configs (...) - User configs can override/add any from above
+	ConfPaths []string
+
 	Modules []Module
 
 	// Server config.
@@ -145,11 +151,17 @@ func Init(mode, importPath, srcPath string) {
 	if ConfPaths == nil {
 		ConfPaths = []string{}
 	}
-	ConfPaths = append(
-		ConfPaths,
-		path.Join(BasePath, "conf"),
-		path.Join(RevelPath, "conf"),
-	)
+
+	// Config load order
+	// 1. framework (revel/conf/*)
+	// 2. application (conf/*)
+	// 3. user supplied configs (...) - User configs can override/add any from above
+	ConfPaths := append(
+		[]string{
+			path.Join(RevelPath, "conf"),
+			path.Join(BasePath, "conf"),
+		},
+		ConfPaths...)
 
 	TemplatePaths = []string{
 		ViewsPath,
