]> gitweb.fluxo.info Git - hydra.git/commitdiff
Even more provision config locations
authorSilvio Rhatto <rhatto@riseup.net>
Tue, 22 Sep 2015 02:34:50 +0000 (23:34 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Tue, 22 Sep 2015 02:34:50 +0000 (23:34 -0300)
share/hydractl/provision

index 7928e1b593911ea99c3e5b494faca84acb564937..844debbff28ace8d70dacb636955417873a42572 100755 (executable)
@@ -116,15 +116,21 @@ if [ ! -z "$1" ]; then
   if [ -f "$1" ]; then
     echo "Using configuration from file $1..."
     source "$1"
-  if [ -f "$1.conf" ]; then
+  elif [ -f "$1.conf" ]; then
     echo "Using configuration from file $1.conf..."
     source "$1.conf"
-  if [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then
+  elif [ -f "$HYDRA_FOLDER/config/provision/$1" ]; then
     echo "Using configuration from $HYDRA_FOLDER/config/provision/$1..."
     source "$1"
-  if [ -f "$HYDRA_FOLDER/config/provision/$1.conf" ]; then
+  elif [ -f "$HYDRA_FOLDER/config/provision/$1.conf" ]; then
     echo "Using configuration from $HYDRA_FOLDER/config/provision/$1.conf..."
     source "$1.conf"
+  elif [ -f "$APP_BASE/share/config/provision/$1" ]; then
+    echo "Using configuration from $APP_BASE/share/config/provision/$1..."
+    source "$1"
+  elif [ -f "$APP_BASE/share/config/provision/$1.conf" ]; then
+    echo "Using configuration from $APP_BASE/share/config/provision/$1.conf..."
+    source "$1.conf"
   else
     echo "File not found: $1"
     exit 1