diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-02-28 14:54:29 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-02-28 14:54:29 -0300 |
| commit | f847a348c2eae31d5c13b4af443fe0cef16e465e (patch) | |
| tree | 2c66a05dea8e99a6b6d3b4e186b31fd4590bd740 /lib/hydra/config | |
| parent | 852af63d40c0e1d286fef163088b51f45296024c (diff) | |
| download | hydra-f847a348c2eae31d5c13b4af443fe0cef16e465e.tar.gz hydra-f847a348c2eae31d5c13b4af443fe0cef16e465e.tar.bz2 | |
Change from PRIVATE_REPOS to the new config scheme
Diffstat (limited to 'lib/hydra/config')
| -rw-r--r-- | lib/hydra/config | 14 |
1 files changed, 7 insertions, 7 deletions
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" } |