From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 21 Sep 2015 12:50:46 +0000 (-0300)
Subject: Support for more provision config locations
X-Git-Tag: 0.2.4~297
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=dce9c6b35b92fd56c34df71bed1caa40af0604ec;p=hydra.git

Support for more provision config locations
---

diff --git a/share/hydractl/provision b/share/hydractl/provision
index e2ebbd9..7928e1b 100755
--- a/share/hydractl/provision
+++ b/share/hydractl/provision
@@ -116,6 +116,15 @@ if [ ! -z "$1" ]; then
   if [ -f "$1" ]; then
     echo "Using configuration from file $1..."
     source "$1"
+  if [ -f "$1.conf" ]; then
+    echo "Using configuration from file $1.conf..."
+    source "$1.conf"
+  if [ -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
+    echo "Using configuration from $HYDRA_FOLDER/config/provision/$1.conf..."
+    source "$1.conf"
   else
     echo "File not found: $1"
     exit 1