Index: server/config/file.go
--- server/config/file.go.orig
+++ server/config/file.go
@@ -72,7 +72,7 @@ func resolveConfigFilePath(path string) (string, error
 
 	// Search for the relative path to the file in the config folder, taking into account
 	// various common starting points.
-	if configFile := fileutils.FindFile(filepath.Join("config", path)); configFile != "" {
+	if configFile := fileutils.FindFile(filepath.Join("${SYSCONFDIR}/mattermost", path)); configFile != "" {
 		return configFile, nil
 	}