[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-27-g90c7016

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 5611e29be2ee324ba96ed72a351b87f902a9f6ff
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 23 11:40:54 2012 +0200

    mv home/*/.forward instances/forward.$HOSTNAME
    
    the .forward file will be shared by master and slave
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index b6dbace..b6c4b6f 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,7 @@ install-conf-4-running-from-git:
 	install -d $(DESTDIR)$(etcdir)/piuparts
 	install -m 0644 home/piupartsm/crontab $(DESTDIR)$(etcdir)/piuparts/crontab-master
 	install -m 0644 home/piupartss/crontab $(DESTDIR)$(etcdir)/piuparts/crontab-slave
-	install -m 0644 home/piupartsm/.forward $(DESTDIR)$(etcdir)/piuparts/forward-master
-	install -m 0644 home/piupartss/.forward $(DESTDIR)$(etcdir)/piuparts/forward-slave
+	install -m 0644 instances/forward.* $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 instances/piuparts.conf.* $(DESTDIR)$(etcdir)/piuparts/
 	install -d $(DESTDIR)$(sharedir)/piuparts/slave
 	install -m 0755 update-piuparts-setup $(DESTDIR)$(sharedir)/piuparts/slave/
diff --git a/home/piupartsm/.forward b/instances/forward.goldwasser
similarity index 100%
rename from home/piupartsm/.forward
rename to instances/forward.goldwasser
diff --git a/home/piupartss/.forward b/instances/forward.piatti
similarity index 100%
rename from home/piupartss/.forward
rename to instances/forward.piatti
diff --git a/update-piuparts-setup b/update-piuparts-setup
index bf6efef..35c2f59 100755
--- a/update-piuparts-setup
+++ b/update-piuparts-setup
@@ -88,12 +88,15 @@ mkdir -p master slave backup
 sudo chown piupartss:piuparts slave
 sudo chown piupartsm:piuparts master htdocs backup
 # to support multiple hosts with this setup
-HOSTNAME=`hostname`
 cd $PIUPARTS_PREFIX/etc/piuparts
 pwd
 sudo chown piupartss:piuparts . piuparts.conf.*
 chmod 0664 piuparts.conf.*
-ln -sf piuparts.conf.$HOSTNAME piuparts.conf
+HOSTNAME=$(hostname)
+for f in piuparts.conf forward
+do
+	ln -sf $f.$HOSTNAME $f
+done
 
 #
 # create working dir
@@ -108,7 +111,7 @@ pwd
 test ! -L bin || rm bin
 test ! -d bin || mv bin bin.old
 ln -sf $PIUPARTS_PREFIX/share/piuparts/slave bin
-cp $PIUPARTS_PREFIX/etc/piuparts/forward-slave .forward
+cp $PIUPARTS_PREFIX/etc/piuparts/forward .forward
 crontab $PIUPARTS_PREFIX/etc/piuparts/crontab-slave
 
 #
@@ -119,7 +122,7 @@ set -e
 test ! -L bin || rm bin
 test ! -d bin || mv bin bin.old
 ln -sf $PIUPARTS_PREFIX/share/piuparts/master bin
-cp $PIUPARTS_PREFIX/etc/piuparts/forward-master .forward
+cp $PIUPARTS_PREFIX/etc/piuparts/forward .forward
 crontab $PIUPARTS_PREFIX/etc/piuparts/crontab-master
 "
 

-- 
piuparts git repository