[Piuparts-commits] [SCM] piuparts git repository branch, bikeshed, updated. 0.50-192-g27ab6cb

[Holger Levsen]

The following commit has been merged in the bikeshed branch:
commit 3cc5ee81713883e24de92329ff7c45d4e78eccd5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon May 13 16:02:57 2013 +0200

    more pejacevic updates: drop forward files

diff --git a/Makefile b/Makefile
index 02fe074..481ce56 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,6 @@ install-conf-4-running-from-git: build-stamp
 	install -m 0644 conf/crontab-master $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 conf/crontab-slave $(DESTDIR)$(etcdir)/piuparts/
 	install -m 0644 conf/distros.conf $(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
 	install -m 0755 update-piuparts-setup $(DESTDIR)$(sharedir)/piuparts/slave/
diff --git a/TODO b/TODO
index 1484d3b..fce3487 100644
--- a/TODO
+++ b/TODO
@@ -61,10 +61,9 @@ for 0.5x:
   - do not use eatmydata (we're using tmpfs in RAM anyway, so installing it
     just slows things down)
   - ~/bin is not added to PATH
-  - .forward files are not used anymore, drop them from the source
 
 - re-read all documentation carefully and update were needed.
-  - update+cleanup README_pejacevic
+  - cleanup README_pejacevic
 
 - Drop update-piuparts-setup?
 
diff --git a/debian/changelog b/debian/changelog
index 737fd57..9f7e8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,6 +93,11 @@ piuparts (0.51) UNRELEASED; urgency=low
   * Use /srv/piuparts.debian.org/ on piatti.debian.org as per DSA policy.
   * detect_slave_problems: remove check limiting this script to be run on
     piatti only.
+  * Provide instance configuration for pejacevic.d.o and piu-slave-bm-a.d.o.
+  * Move README_piatti.txt and README_pejacevic.txt and update accordingly.
+  * Provide two new helper scripts for running from git:
+    update-piuparts-master-setup and update-piuparts-slave-setup.
+  * Drop instances/forward.* files.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Mar 2013 00:14:13 +0100
 
diff --git a/instances/forward.goldwasser b/instances/forward.goldwasser
deleted file mode 100644
index e39ee18..0000000
--- a/instances/forward.goldwasser
+++ /dev/null
@@ -1 +0,0 @@
-piuparts-reports
diff --git a/instances/forward.pejacevic b/instances/forward.pejacevic
deleted file mode 120000
index 069eb97..0000000
--- a/instances/forward.pejacevic
+++ /dev/null
@@ -1 +0,0 @@
-forward.piatti
\ No newline at end of file
diff --git a/instances/forward.piatti b/instances/forward.piatti
deleted file mode 100644
index 0966561..0000000
--- a/instances/forward.piatti
+++ /dev/null
@@ -1 +0,0 @@
-piuparts-reports at lists.alioth.debian.org
diff --git a/instances/forward.piu-slave-bm-a b/instances/forward.piu-slave-bm-a
deleted file mode 120000
index 069eb97..0000000
--- a/instances/forward.piu-slave-bm-a
+++ /dev/null
@@ -1 +0,0 @@
-forward.piatti
\ No newline at end of file
diff --git a/update-piuparts-master-setup b/update-piuparts-master-setup
index 6b96110..47f91c0 100755
--- a/update-piuparts-master-setup
+++ b/update-piuparts-master-setup
@@ -95,7 +95,7 @@ mkdir -p master backup
 # to support multiple hosts with this setup
 cd etc/piuparts
 HOSTNAME=$(hostname)
-for f in piuparts.conf forward
+for f in piuparts.conf
 do
 	ln -sf $f.$HOSTNAME $f
 done
@@ -111,7 +111,6 @@ mkdir -p $PIUPARTS_TMPDIR
 cd
 pwd
 ln -sf $PIUPARTS_PREFIX/share/piuparts/master bin
-cp $PIUPARTS_PREFIX/etc/piuparts/forward .forward
 crontab $PIUPARTS_PREFIX/etc/piuparts/crontab-master
 
 echo "Update finished."
diff --git a/update-piuparts-setup b/update-piuparts-setup
index 34991e9..0464ce7 100755
--- a/update-piuparts-setup
+++ b/update-piuparts-setup
@@ -110,7 +110,7 @@ pwd
 sudo chown piupartss:piuparts . piuparts.conf.*
 chmod 0664 piuparts.conf.*
 HOSTNAME=$(hostname)
-for f in piuparts.conf forward
+for f in piuparts.conf
 do
 	ln -sf $f.$HOSTNAME $f
 done
@@ -128,7 +128,6 @@ 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 .forward
 crontab $PIUPARTS_PREFIX/etc/piuparts/crontab-slave
 
 #
@@ -139,7 +138,6 @@ 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 .forward
 crontab $PIUPARTS_PREFIX/etc/piuparts/crontab-master
 "
 
diff --git a/update-piuparts-slave-setup b/update-piuparts-slave-setup
index e667c80..e564bfc 100755
--- a/update-piuparts-slave-setup
+++ b/update-piuparts-slave-setup
@@ -84,7 +84,7 @@ mkdir -p slave slave/basetgz
 # to support multiple hosts with this setup
 cd etc/piuparts
 HOSTNAME=$(hostname)
-for f in piuparts.conf forward
+for f in piuparts.conf
 do
 	ln -sf $f.$HOSTNAME $f
 done
@@ -100,7 +100,6 @@ mkdir -p $PIUPARTS_TMPDIR
 cd
 pwd
 ln -sf $PIUPARTS_PREFIX/share/piuparts/slave bin
-cp $PIUPARTS_PREFIX/etc/piuparts/forward .forward
 crontab $PIUPARTS_PREFIX/etc/piuparts/crontab-slave
 
 echo "Update finished."

-- 
piuparts git repository