From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 22 Sep 2015 02:34:50 +0000 (-0300)
Subject: Even more provision config locations
X-Git-Tag: 0.2.4~296
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e2ebab8ff267604c65157e6a7c9765541bdf8adb;p=hydra.git

Even more provision config locations
---

diff --git a/share/hydractl/provision b/share/hydractl/provision
index 7928e1b..844debb 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -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