From f847a348c2eae31d5c13b4af443fe0cef16e465e Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 28 Feb 2014 14:54:29 -0300
Subject: Change from PRIVATE_REPOS to the new config scheme

---
 lib/hydra/config | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib/hydra/config')

diff --git a/lib/hydra/config b/lib/hydra/config
index 37442ac..3cd7cc7 100644
--- a/lib/hydra/config
+++ b/lib/hydra/config
@@ -35,13 +35,9 @@ function hydra_config_load_preferences {
 
 # Check preferences
 function hydra_check_preferences {
-  if [ ! -z "$PUPPET" ] && [ ! -d "$PUPPET" ]; then
-    echo "Puppet folder not found: $PUPPET."
-    exit 1
-  fi
-
-  if [ -z "$PUPPET_KEYS" ]; then
-    PUPPET_KEYS="$PUPPET/modules/site_keys/files"
+  # Check for parameters that should not be set in preferences anymore
+  if [ ! -z "$PUPPET" ]; then
+    echo "Using deprecated config PUPPET, please update $PREFERENCES."
   fi
 
   if [ ! -z "$REMOTE_REPOS" ]; then
@@ -52,6 +48,10 @@ function hydra_check_preferences {
     echo "Using deprecated config PRIVATE_REPOS, please update $PREFERENCES."
   fi
 
+  # Set basic variables
+  PUPPET="$HYDRA_FOLDER/puppet"
+  PUPPET_KEYS="$PUPPET/modules/site_keys/files"
+
   export HYDRA_CONNECT="ssh -T -o ConnectTimeout=15"
 }
 
-- 
cgit v1.2.3