From b15d4b2dc5a936052a7477a9c6ace3ac38e81dd1 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Tue, 4 Mar 2014 14:23:21 -0300
Subject: Updating for puppet-bootstrap compatibility

---
 README.md                | 2 +-
 lib/hydra/config         | 1 +
 share/hydractl/bootstrap | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 12bc4ce..c720ca8 100644
--- a/README.md
+++ b/README.md
@@ -37,5 +37,5 @@ Creating a new network
 
 To create the needed repositories to start a new network, use a similar command:
 
-    hydra example init ~/file/example
+    hydra example init   ~/file/example
     hydra example config domain example.org
diff --git a/lib/hydra/config b/lib/hydra/config
index 8dbda89..fe7606e 100644
--- a/lib/hydra/config
+++ b/lib/hydra/config
@@ -78,6 +78,7 @@ function hydra_bootstrap_config {
 
   (
     cd $config
+    make deps
     make submodules
     make config
   )
diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 3821dd7..0d60b50 100755
--- a/share/hydractl/bootstrap
+++ b/share/hydractl/bootstrap
@@ -23,11 +23,14 @@ if [ "$STAGE" == "repository" ]; then
 
   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
+    chown -R puppet. /etc/puppet
   fi
 fi
 
 if [ -e "/etc/puppet/manifests/$stage.pp" ]; then
-  puppet apply /etc/puppet/manifests/$stage.pp
+  (
+    cd /etc/puppet
+    make apply stage=$stage
+  )
 fi
-- 
cgit v1.2.3