[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 05ca91b9f3f458eb68383c047f18722d947333c3
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Jun 23 12:01:02 2012 +0200

    mv home/piuparts?/crontab conf/crontab-$ROLE
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/Makefile b/Makefile
index b6c4b6f..9cc9d0f 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,8 @@ install-conf:
 	install -m 0644 conf/piuparts.conf.sample $(etcdir)/piuparts/piuparts.conf
 
 	install -d $(etcdir)/cron.d
-	install -m 0644 home/piupartsm/crontab $(etcdir)/cron.d/piuparts-master
-	install -m 0644 home/piupartss/crontab $(etcdir)/cron.d/piuparts-slave
+	install -m 0644 conf/crontab-master $(DESTDIR)$(etcdir)/cron.d/piuparts-master
+	install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/cron.d/piuparts-slave
 	sed -i -r '/^[^#]+/s/^/#/' $(etcdir)/cron.d/piuparts-*
 
 	install -d $(etcdir)/piuparts/known_problems
@@ -57,8 +57,8 @@ install-conf:
 
 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 conf/crontab-master $(DESTDIR)$(etcdir)/piuparts/
+	install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 instances/forward.* $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 instances/piuparts.conf.* $(DESTDIR)$(etcdir)/piuparts/
 	install -d $(DESTDIR)$(sharedir)/piuparts/slave
diff --git a/home/piupartsm/crontab b/conf/crontab-master
similarity index 100%
rename from home/piupartsm/crontab
rename to conf/crontab-master
diff --git a/home/piupartss/crontab b/conf/crontab-slave
similarity index 100%
rename from home/piupartss/crontab
rename to conf/crontab-slave

-- 
piuparts git repository