Updated mrconfig.sh and sample .mrconfig

3 files changed, 263 insertions, 5 deletions

diff --git a/.mrconfig b/.mrconfig
new file mode 100644
index 0000000..0a9cd4d
--- /dev/null
+++ b/.mrconfig
@@ -0,0 +1,252 @@
+
+[puppet/modules/apache]
+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/apt]
+checkout = git clone git://git.sarava.org/puppet-apt.git apt
+
+[puppet/modules/autofs]
+checkout = git clone git://git.sarava.org/puppet-autofs.git autofs
+
+[puppet/modules/autossh]
+checkout = git clone git://git.sarava.org/puppet-autossh.git autossh
+
+[puppet/modules/avahi]
+checkout = git clone git://git.sarava.org/puppet-avahi.git avahi
+
+[puppet/modules/backup]
+checkout = git clone git://git.sarava.org/puppet-backup.git backup
+
+[puppet/modules/backupninja]
+checkout = git clone git://git.sarava.org/puppet-backupninja.git backupninja
+
+[puppet/modules/bind]
+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
+
+[puppet/modules/concat]
+checkout = git clone git://git.sarava.org/puppet-concat.git concat
+
+[puppet/modules/cron]
+checkout = git clone git://git.sarava.org/puppet-cron.git cron
+
+[puppet/modules/daap_server]
+checkout = git clone git://git.sarava.org/puppet-daap_server.git daap_server
+
+[puppet/modules/darkice]
+checkout = git clone git://git.sarava.org/puppet-darkice.git darkice
+
+[puppet/modules/database]
+checkout = git clone git://git.sarava.org/puppet-database.git database
+
+[puppet/modules/dhcp]
+checkout = git clone git://git.sarava.org/puppet-dhcp.git dhcp
+
+[puppet/modules/domain_check]
+checkout = git clone git://git.sarava.org/puppet-domain_check.git domain_check
+
+[puppet/modules/drupal]
+checkout = git clone git://git.sarava.org/puppet-drupal.git drupal
+
+[puppet/modules/dyndns]
+checkout = git clone git://git.sarava.org/puppet-dyndns.git dyndns
+
+[puppet/modules/ejabberd]
+checkout = git clone git://git.sarava.org/puppet-ejabberd.git ejabberd
+
+[puppet/modules/ekeyd]
+checkout = git clone git://git.sarava.org/puppet-ekeyd.git ekeyd
+
+[puppet/modules/etherpad]
+checkout = git clone git://git.sarava.org/puppet-etherpad.git etherpad
+
+[puppet/modules/exim]
+checkout = git clone git://git.sarava.org/puppet-exim.git exim
+
+[puppet/modules/firewall]
+checkout = git clone git://git.sarava.org/puppet-firewall.git firewall
+
+[puppet/modules/git]
+checkout = git clone git://git.sarava.org/puppet-git.git git
+
+[puppet/modules/hotglue]
+checkout = git clone git://git.sarava.org/puppet-hotglue.git hotglue
+
+[puppet/modules/hydra]
+checkout = git clone git://git.sarava.org/puppet-hydra.git hydra
+
+[puppet/modules/icecast]
+checkout = git clone git://git.sarava.org/puppet-icecast.git icecast
+
+[puppet/modules/ikiwiki]
+checkout = git clone git://git.sarava.org/puppet-ikiwiki.git ikiwiki
+
+[puppet/modules/inetd]
+checkout = git clone git://git.sarava.org/puppet-inetd.git inetd
+
+[puppet/modules/infinoted]
+checkout = git clone git://git.sarava.org/puppet-infinoted.git infinoted
+
+[puppet/modules/inifile]
+checkout = git clone git://git.sarava.org/puppet-inifile.git inifile
+
+[puppet/modules/lighttpd]
+checkout = git clone git://git.sarava.org/puppet-lighttpd.git lighttpd
+
+[puppet/modules/lsb]
+checkout = git clone git://git.sarava.org/puppet-lsb.git lsb
+
+[puppet/modules/mail]
+checkout = git clone git://git.sarava.org/puppet-mail.git mail
+
+[puppet/modules/minidlna]
+checkout = git clone git://git.sarava.org/puppet-minidlna.git minidlna
+
+[puppet/modules/moin]
+checkout = git clone git://git.sarava.org/puppet-moin.git moin
+
+[puppet/modules/monkeysphere]
+checkout = git clone git://git.sarava.org/puppet-monkeysphere.git monkeysphere
+
+[puppet/modules/motion]
+checkout = git clone git://git.sarava.org/puppet-motion.git motion
+
+[puppet/modules/mpd]
+checkout = git clone git://git.sarava.org/puppet-mpd.git mpd
+
+[puppet/modules/mumble]
+checkout = git clone git://git.sarava.org/puppet-mumble.git mumble
+
+[puppet/modules/munin]
+checkout = git clone git://git.sarava.org/puppet-munin.git munin
+
+[puppet/modules/mysql]
+checkout = git clone git://git.sarava.org/puppet-mysql.git mysql
+
+[puppet/modules/nagios]
+checkout = git clone git://git.sarava.org/puppet-nagios.git nagios
+
+[puppet/modules/nfs]
+checkout = git clone git://git.sarava.org/puppet-nfs.git nfs
+
+[puppet/modules/nginx]
+checkout = git clone git://git.sarava.org/puppet-nginx.git nginx
+
+[puppet/modules/nodo]
+checkout = git clone git://git.sarava.org/puppet-nodo.git nodo
+
+[puppet/modules/ntp]
+checkout = git clone git://git.sarava.org/puppet-ntp.git ntp
+
+[puppet/modules/onion]
+checkout = git clone git://git.sarava.org/puppet-onion.git onion
+
+[puppet/modules/pear]
+checkout = git clone git://git.sarava.org/puppet-pear.git pear
+
+[puppet/modules/php]
+checkout = git clone git://git.sarava.org/puppet-php.git php
+
+[puppet/modules/pmwiki]
+checkout = git clone git://git.sarava.org/puppet-pmwiki.git pmwiki
+
+[puppet/modules/postfix]
+checkout = git clone git://git.sarava.org/puppet-postfix.git postfix
+
+[puppet/modules/puppet]
+checkout = git clone git://git.sarava.org/puppet-puppet.git puppet
+
+[puppet/modules/pureftpd]
+checkout = git clone git://git.sarava.org/puppet-pureftpd.git pureftpd
+
+[puppet/modules/pyroscope]
+checkout = git clone git://git.sarava.org/puppet-pyroscope.git pyroscope
+
+[puppet/modules/qwebirc]
+checkout = git clone git://git.sarava.org/puppet-qwebirc.git qwebirc
+
+[puppet/modules/reprepro]
+checkout = git clone git://git.sarava.org/puppet-reprepro.git reprepro
+
+[puppet/modules/resolvconf]
+checkout = git clone git://git.sarava.org/puppet-resolvconf.git resolvconf
+
+[puppet/modules/rng-tools]
+checkout = git clone git://git.sarava.org/puppet-rng-tools.git rng-tools
+
+[puppet/modules/rsync]
+checkout = git clone git://git.sarava.org/puppet-rsync.git rsync
+
+[puppet/modules/runit]
+checkout = git clone git://git.sarava.org/puppet-runit.git runit
+
+[puppet/modules/samba]
+checkout = git clone git://git.sarava.org/puppet-samba.git samba
+
+[puppet/modules/schroot]
+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/smartmontools]
+checkout = git clone git://git.sarava.org/puppet-smartmontools.git smartmontools
+
+[puppet/modules/sshd]
+checkout = git clone git://git.sarava.org/puppet-sshd.git sshd
+
+[puppet/modules/ssl]
+checkout = git clone git://git.sarava.org/puppet-ssl.git ssl
+
+[puppet/modules/supervisor]
+checkout = git clone git://git.sarava.org/puppet-supervisor.git supervisor
+
+[puppet/modules/supybot]
+checkout = git clone git://git.sarava.org/puppet-supybot.git supybot
+
+[puppet/modules/syslog-ng]
+checkout = git clone git://git.sarava.org/puppet-syslog-ng.git syslog-ng
+
+[puppet/modules/tftp]
+checkout = git clone git://git.sarava.org/puppet-tftp.git tftp
+
+[puppet/modules/tor]
+checkout = git clone git://git.sarava.org/puppet-tor.git tor
+
+[puppet/modules/trac]
+checkout = git clone git://git.sarava.org/puppet-trac.git trac
+
+[puppet/modules/tunnel]
+checkout = git clone git://git.sarava.org/puppet-tunnel.git tunnel
+
+[puppet/modules/user]
+checkout = git clone git://git.sarava.org/puppet-user.git user
+
+[puppet/modules/vcsrepo]
+checkout = git clone git://git.sarava.org/puppet-vcsrepo.git vcsrepo
+
+[puppet/modules/viewvc]
+checkout = git clone git://git.sarava.org/puppet-viewvc.git viewvc
+
+[puppet/modules/virtual]
+checkout = git clone git://git.sarava.org/puppet-virtual.git virtual
+
+[puppet/modules/websites]
+checkout = git clone git://git.sarava.org/puppet-websites.git websites
+
+[puppet/modules/websvn]
+checkout = git clone git://git.sarava.org/puppet-websvn.git websvn
+
+[puppet/modules/wordpress]
+checkout = git clone git://git.sarava.org/puppet-wordpress.git wordpress
diff --git a/README b/README
index 716f047..ecea55b 100644
--- a/README
+++ b/README
@@ -2,4 +2,4 @@ Puppet Boostrap Module
 ======================
 
 This is a very specific puppet module that boostraps a node for use with
-Hydra Suite, https://git.sarava.org/?p=hydra.git;a=summary
+Hydra Suite, https://git.sarava.org/?p=hydra.git
diff --git a/mrconfig.sh b/mrconfig.sh
index dc4959b..3ea3646 100755
--- a/mrconfig.sh
+++ b/mrconfig.sh
@@ -6,16 +6,22 @@
 # Parameters
 GIT="git.sarava.org"
 URL="https://$GIT/?a=project_index"
-CWD="`dirname $0`"
+CWD="`pwd`"
+WORK="`dirname $0`"
 
 # Create a new config
-echo "" > $CWD/.mrconfig
+cd $WORK
+rm -f .mrconfig
+touch .mrconfig
 
 # Fetch repository list and updtate mrconfig
 curl --stderr - $URL | grep "^puppet-" | while read module; do
   folder="`echo $module | sed -e 's/^puppet-//'`"
   folder="`basename $folder .git`"
   
-  echo "[$folder]" >> $CWD/.mrconfig
-  echo "  checkout = git clone git://$GIT/$module $folder" >> $CWD/.mrconfig
+  echo "Processing $folder..."
+  mr config puppet/modules/$folder checkout="git clone git://$GIT/$module $folder"
 done
+
+# Teardown
+cd $CWD