aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-03 15:21:50 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-03 15:21:50 -0300
commit6083f9b9a7f14deff710593234701de640fbff7f (patch)
treea217b2404c8f593f470b634e2972a4730ea910ec
parent72d53ee47a6e62af63fbd9805b5eed08d9f0944d (diff)
downloadhydra-6083f9b9a7f14deff710593234701de640fbff7f.tar.gz
hydra-6083f9b9a7f14deff710593234701de640fbff7f.tar.bz2
Updating hydractl bootstrap
-rwxr-xr-xshare/hydractl/bootstrap12
1 files changed, 7 insertions, 5 deletions
diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 735908c..3821dd7 100755
--- a/share/hydractl/bootstrap
+++ b/share/hydractl/bootstrap
@@ -21,11 +21,13 @@ STAGE="$1"
if [ "$STAGE" == "repository" ]; then
hydractl puppet-install
- rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
- chown -R puppet. /etc/puppet
- hydra_bootstrap_config /etc/puppet
+ if [ ! -d "/etc/puppet/.git" ]; then
+ rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
+ chown -R puppet. /etc/puppet
+ hydra_bootstrap_config /etc/puppet
+ fi
fi
-if [ -e "/etc/puppet/modules/bootstrap/manifests/$stage.pp" ]; then
- puppet apply /etc/puppet/modules/bootstrap/manifests/$stage.pp
+if [ -e "/etc/puppet/manifests/$stage.pp" ]; then
+ puppet apply /etc/puppet/manifests/$stage.pp
fi