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

Mon May 13 20:18:22 UTC 2013

The following commit has been merged in the bikeshed branch:
commit d0be86dba71c9f15070fd4d67e04b02fdab689c8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon May 13 12:50:32 2013 +0200

    detect_slave_problems: remove check limiting this script to be run on piatti only.

diff --git a/README_pejacevic.txt b/README_pejacevic.txt
index ca5201d..b489bb2 100644
--- a/README_pejacevic.txt
+++ b/README_pejacevic.txt
@@ -1,6 +1,13 @@
 Notes about the piuparts installation on pejacevic.debian.org and it's slave
 ============================================================================
 
+This document describes the setup for http://piuparts.debian.org - it's used 
+for reference for the Debian System Administrators (DSA) as well as a guide
+for other setting up a similar system, with the piuparts source code
+installed from git. For regular installations we recommend to use the
+piuparts-master and piuparts-slaves packages as described in 
+/usr/share/doc/piuparts-master/README_server.txt
+
 == ToDo
 
 - re-read everything and update for pejacevic.d.o
@@ -11,23 +18,33 @@ piuparts.debian.org is a setup running on two systems: pejacevic.debian.org, run
 
 === User setup
 
-A piupartss (on piu-slave-bm-a) and a piupartsm (on pejacevic) user is needed. Both are members of the group piuparts and /srv/piuparts.debian.org is 774 piupartss:piuparts.
+A piupartss (on piu-slave-bm-a) and a piupartsm (on pejacevic) user is needed. Both are members of the group piuparts and '/srv/piuparts.debian.org' is 774 piupartss:piuparts.
 Both user have some files in $HOME which are kept in git, including hidden files.
 
-FIXME: this needs to be added to ~/.bashrc: export PATH="~/bin:$PATH"
+FIXME: this needs to be added to '~/.bashrc':
+----
+export PATH="~/bin:$PATH"
+----
 
-Create an SSH keypair for piupartss and put it into ~/.ssh/authorized_keys of the piupartsm user, so the piupartss can login with ssh to localhost as piupartsm.
+Create an SSH keypair for piupartss and put it into '~/.ssh/authorized_keys' of the piupartsm user, so the piupartss can login with ssh to localhost as piupartsm.
 
-=== '/etc/sudoers' for piatti
+=== '/etc/sudoers' for pejacevic
+
+----
+#piuparts admins
+%piuparts       ALL=(piupartsm) ALL
+----
+
+=== '/etc/sudoers' for piu-slave-bm-a
 
 ----
 # The piuparts slave needs to handle chroots.
 piupartss       ALL = NOPASSWD: ALL
 
 #piuparts admins
-%piuparts       ALL=(piupartss) ALL
 %piuparts       ALL=(piupartsm) ALL
----
+----
+
 
 === piuparts installation from source
 
diff --git a/debian/changelog b/debian/changelog
index 5378545..737fd57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,6 +91,8 @@ piuparts (0.51) UNRELEASED; urgency=low
     - Run slave_cleanup before starting the slave.
   * Bump Standards-Version to 3.9.4.
   * 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.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Mar 2013 00:14:13 +0100
 
diff --git a/debian/piuparts-master.docs b/debian/piuparts-master.docs
index 2506164..c4cb52b 100644
--- a/debian/piuparts-master.docs
+++ b/debian/piuparts-master.docs
@@ -1,3 +1,3 @@
 README_server.txt
-README_piatti.txt
+README_pejacevic.txt
 conf/piuparts.conf.sample
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index c962b7a..e7c0d42 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -1,7 +1,7 @@
 #
-# This is the configuration file for piuparts running in master-slave mode on a host called goldwasser
+# This is the configuration file for piuparts running in master-slave mode on a (development) host called goldwasser
 #
-# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt
+# For more information on this setup see /usr/share/doc/piuparts-master/README_server.txt
 #
 
 [DEFAULT]
diff --git a/instances/piuparts.conf.pejacevic b/instances/piuparts.conf.pejacevic
index 58c6c37..92c8dad 100644
--- a/instances/piuparts.conf.pejacevic
+++ b/instances/piuparts.conf.pejacevic
@@ -75,7 +75,7 @@ sections =
 	lenny2squeeze
 #
 mirror = http://mirror.bm.debian.org/debian/
-master-host = localhost
+master-host = pejacevic.debian.org
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
diff --git a/instances/piuparts.conf.piu-slave-bm-a b/instances/piuparts.conf.piu-slave-bm-a
index 07e2415..42a351d 100644
--- a/instances/piuparts.conf.piu-slave-bm-a
+++ b/instances/piuparts.conf.piu-slave-bm-a
@@ -76,7 +76,7 @@ sections =
 	lenny2squeeze
 #
 mirror = http://mirror.bm.debian.org/debian/
-master-host = localhost
+master-host = pejacevic.debian.org
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
diff --git a/slave-bin/detect_slave_problems.in b/slave-bin/detect_slave_problems.in
index 2d6a4b2..2e72040 100755
--- a/slave-bin/detect_slave_problems.in
+++ b/slave-bin/detect_slave_problems.in
@@ -40,12 +40,6 @@ file_age()
 }
 
 
-HOSTNAME=`hostname`
-if [ "$HOSTNAME" != "piatti" ] ; then
-	exit 0
-fi
-
-
 get_config_value SLAVEROOT global slave-directory
 get_config_value IDLE_SLEEP global idle-sleep 1800
 
diff --git a/update-piuparts-master-setup b/update-piuparts-master-setup
index 7b8defd..6b96110 100755
--- a/update-piuparts-master-setup
+++ b/update-piuparts-master-setup
@@ -2,7 +2,7 @@
 set -e
 
 #
-#  update piuparts master setup on pejacevic.debian.org
+#  update piuparts master setup from git (eg. used on pejacevic.debian.org)
 #
 
 # Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
diff --git a/update-piuparts-slave-setup b/update-piuparts-slave-setup
index a1092d8..e667c80 100755
--- a/update-piuparts-slave-setup
+++ b/update-piuparts-slave-setup
@@ -2,7 +2,7 @@
 set -e
 
 #
-#  update piuparts setup on piatti.debian.org
+#  update piuparts slave setup from git (eg. used on piu-slave-bm-a.debian.org)
 #
 
 # Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)

-- 
piuparts git repository

