From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 3 Mar 2014 18:21:50 +0000 (-0300)
Subject: Updating hydractl bootstrap
X-Git-Tag: 0.2.2~96
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6083f9b9a7f14deff710593234701de640fbff7f;p=hydra.git

Updating hydractl bootstrap
---

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