From 587f206824274d7d1cfcb1072ea8f818493bd317 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 1 Oct 2014 13:05:34 -0300
Subject: Squashed 'puppet/' changes from bb2eae6..2979f23

2979f23 Updating mrconfig
6f77549 Updating Vagrantfile
6848013 Use git clone --recursive for puppet modules

git-subtree-dir: puppet
git-subtree-split: 2979f23a78bb7ce96599904547502c2c922b45d4
---
 .mrconfig    | 9 +++++++++
 TODO.md      | 1 +
 Vagrantfile  | 2 +-
 bin/mrconfig | 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.mrconfig b/.mrconfig
index 2a17395..8731bee 100644
--- a/.mrconfig
+++ b/.mrconfig
@@ -5,6 +5,9 @@ checkout = git clone git://git.sarava.org/puppet-apache.git apache
 [puppet/modules/apcupsd]
 checkout = git clone git://git.sarava.org/puppet-apcupsd.git apcupsd
 
+[puppet/modules/apparmor]
+checkout = git clone git://git.sarava.org/puppet-apparmor.git apparmor
+
 [puppet/modules/apt]
 checkout = git clone git://git.sarava.org/puppet-apt.git apt
 
@@ -29,6 +32,9 @@ checkout = git clone git://git.sarava.org/puppet-bind.git bind
 [puppet/modules/bitcoind]
 checkout = git clone git://git.sarava.org/puppet-bitcoind.git bitcoind
 
+[puppet/modules/bootstrap]
+checkout = git clone git://git.sarava.org/puppet-bootstrap.git bootstrap
+
 [puppet/modules/common]
 checkout = git clone git://git.sarava.org/puppet-common.git common
 
@@ -197,6 +203,9 @@ checkout = git clone git://git.sarava.org/puppet-schroot.git schroot
 [puppet/modules/shorewall]
 checkout = git clone git://git.sarava.org/puppet-shorewall.git shorewall
 
+[puppet/modules/smartmonster]
+checkout = git clone git://git.sarava.org/puppet-smartmonster.git smartmonster
+
 [puppet/modules/smartmontools]
 checkout = git clone git://git.sarava.org/puppet-smartmontools.git smartmontools
 
diff --git a/TODO.md b/TODO.md
index eab5d0c..1cb987f 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,4 +2,5 @@ TODO
 ====
 
 * Update to new nodo style (hiera and nodo::role).
+* Support for recursive clones in `bin/mrconfig`.
 * Test!
diff --git a/Vagrantfile b/Vagrantfile
index efaa952..e7404a9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ Vagrant::Config.run do |config|
     puppet.manifest_file  = "bootstrap/vagrant.pp"
     puppet.manifests_path = "puppet/manifests"
     puppet.module_path    = "puppet/modules"
-    puppet.pp_path        = "/etc/puppet"
+    puppet.temp_dir       = "/etc/puppet"
   end
 
   # Define a Host VM
diff --git a/bin/mrconfig b/bin/mrconfig
index ffb0438..f525db3 100755
--- a/bin/mrconfig
+++ b/bin/mrconfig
@@ -15,11 +15,11 @@ rm -f .mrconfig
 touch .mrconfig
 
 # Fetch repository list and updtate mrconfig
-curl --stderr - $URL | grep "^puppet-" | while read module; do
+curl --stderr - $URL | grep "^puppet-" | cut -d ' ' -f 1 | while read module; do
   folder="`echo $module | sed -e 's/^puppet-//'`"
   folder="`basename $folder .git`"
   
-  if [ "$module" != "$bootstrap" ];
+  if [ "$module" != "$bootstrap" ]; then
     echo "Processing $folder..."
     mr config puppet/modules/$folder checkout="git clone git://$GIT/$module $folder"
   fi
-- 
cgit v1.2.3