summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-10-01 13:05:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-10-01 13:05:34 -0300
commitbe8dd2fdec438fd67e5a5a90654e8388c9ffa4ad (patch)
tree87d4419defe41a48f7a9d32931f57c7203ef25d5
parentc62a6b218f06e3ebb42c327067cd4b65e988ebf7 (diff)
parent587f206824274d7d1cfcb1072ea8f818493bd317 (diff)
downloaddebian-be8dd2fdec438fd67e5a5a90654e8388c9ffa4ad.tar.gz
debian-be8dd2fdec438fd67e5a5a90654e8388c9ffa4ad.tar.bz2
Merge commit '587f206824274d7d1cfcb1072ea8f818493bd317'
-rw-r--r--puppet/.mrconfig9
-rw-r--r--puppet/TODO.md1
-rw-r--r--puppet/Vagrantfile2
-rwxr-xr-xpuppet/bin/mrconfig4
4 files changed, 13 insertions, 3 deletions
diff --git a/puppet/.mrconfig b/puppet/.mrconfig
index 2a17395..8731bee 100644
--- a/puppet/.mrconfig
+++ b/puppet/.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/puppet/TODO.md b/puppet/TODO.md
index eab5d0c..1cb987f 100644
--- a/puppet/TODO.md
+++ b/puppet/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/puppet/Vagrantfile b/puppet/Vagrantfile
index efaa952..e7404a9 100644
--- a/puppet/Vagrantfile
+++ b/puppet/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/puppet/bin/mrconfig b/puppet/bin/mrconfig
index ffb0438..f525db3 100755
--- a/puppet/bin/mrconfig
+++ b/puppet/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