Allow admin to override default config location also for rebar and su…

…ch (#1627) (cherry picked from commit f0b2915)
zotonic · Mar 2, 2017 · 9ceb9a4 · 9ceb9a4
1 parent 26e3b0f
commit 9ceb9a4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/scripts/helpers/zotonic_setup b/src/scripts/helpers/zotonic_setup
@@ -62,9 +62,13 @@ function find_enabled_sites {
 export -f find_enabled_sites
 
 function find_config {
+    # Allow admin to override default behaviour
+    [ ! -z "$ZOTONIC_CONFIG_DIR" ] && { echo "${ZOTONIC_CONFIG_DIR}/$1"; return 0; }
+
     filename="$1"
     vsn_minor=$(minor_version)
     vsn_major=$(major_version)
+
     for file in "$HOME/.zotonic/$NODENAME/$filename" "$HOME/.zotonic/$vsn_minor/$filename" "$HOME/.zotonic/$vsn_major/$filename" "$HOME/.zotonic/$filename" \
                 "/etc/zotonic/$NODENAME/$filename" "/etc/zotonic/$vsn_minor/$filename" "/etc/zotonic/$vsn_major/$filename" "/etc/zotonic/$filename"
     do
@@ -82,8 +86,6 @@ function consult_config {
 export -f consult_config
 
 function find_config_arg {
-    [ ! -z "$ZOTONIC_CONFIG_DIR" ] && { echo "-config ${ZOTONIC_CONFIG_DIR}/$1"; return 0; }
-
     file=$(find_config $1)
     if [ "$file" == "" ]; then
         break