aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-10-01 13:02:31 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-10-01 13:02:31 -0300
commit2979f23a78bb7ce96599904547502c2c922b45d4 (patch)
tree17c350a4ce73a064218969defd2ef8bdf87249d3
parent6f775490cd0562b36c8fd4b40f0c0f3f35943005 (diff)
downloadpuppet-bootstrap-2979f23a78bb7ce96599904547502c2c922b45d4.tar.gz
puppet-bootstrap-2979f23a78bb7ce96599904547502c2c922b45d4.tar.bz2
Updating mrconfig
-rw-r--r--.mrconfig9
-rw-r--r--TODO.md1
-rwxr-xr-xbin/mrconfig6
3 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/bin/mrconfig b/bin/mrconfig
index bb4ae7c..f525db3 100755
--- a/bin/mrconfig
+++ b/bin/mrconfig
@@ -15,13 +15,13 @@ 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 --recursive git://$GIT/$module $folder"
+ mr config puppet/modules/$folder checkout="git clone git://$GIT/$module $folder"
fi
done