[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

Holger Levsen holger at layer-acht.org
Wed May 15 10:10:13 UTC 2013 

The following commit has been merged in the master branch:
commit f543d577f8aff21b5366585b4f25cc600e7306b0
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun May 12 23:02:58 2013 +0200

    Update scripts to handle installation from git on pejacevic and slave

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/README.txt b/README.txt
index 2bef280..7ce97b9 100644
--- a/README.txt
+++ b/README.txt
@@ -727,6 +727,7 @@ If you want to run piuparts-report (which is only+very useful if
 you run piuparts in master-slave mode), you need to 'apt-get
 install python-rpy r-recommended r-base-dev'. For more
 information see
-link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob;f=README_piatti.txt].
+link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_server.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_server.txt] and
+link:http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_pejacevic.txt[http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=master;a=blob;f=README_pejacevic.txt].
 
 // vim: set filetype=asciidoc:
diff --git a/README_piatti.txt b/README_pejacevic.txt
similarity index 72%
rename from README_piatti.txt
rename to README_pejacevic.txt
index e0f88ca..4d1b039 100644
--- a/README_piatti.txt
+++ b/README_pejacevic.txt
@@ -1,11 +1,12 @@
-Notes about the piuparts installation on piatti.debian.org
-==========================================================
+Notes about the piuparts installation on pejacevic.debian.org and it's slave
+============================================================================
 
-== ToDo
-
-- review sudoers and come up with (a bit) more restrictive one
-- there should be a 2nd group of piuparts-people. those who can sudo into
-  piupartsm to process logfiles. maybe make that the qa-group
+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
 
 == Installation
 
@@ -13,23 +14,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.
-Both user have some files in $HOME which are kept in git, including hidden files.
+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.
 
-FIXME: this needs to be added to ~/.bashrc: export PATH="~/bin:$PATH"
+Create an SSH keypair for piupartss and put it into '/etc/ssh/userkeys/piupartsm' on pejacevic, so the piupartss can login with ssh and run piuparts-master.
+Restrict it like this:
 
-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.
+----
+$ cat /etc/ssh/userkeys/piupartsm
+command="/srv/piuparts.debian.org/share/piuparts/piuparts-master",from="2001:41c8:1000:21::21:7,5.153.231.7",no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa ...
+----
 
-=== '/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
 
@@ -66,16 +77,16 @@ piupartss       ALL = NOPASSWD: ALL
 
 == Updating the piuparts installation
 
-Updating the master, pejacevic:
+Updating the master, pejacevic.debian.org:
 
 ----
-holger at pejacevic$ sudo su - piupartsm update-piuparts-master-setup pejacevic origin
+holger at pejacevic$ sudo su - piupartsm update-piuparts-master-setup bikeshed origin
 ----
 
-Updating the slave, pejacevic:
+Updating the slave, piu-slave-bm-a.debian.org:
 
 ----
-holger at piu-slave-bm-a$ sudo su - piupartss update-piuparts-slave-setup pejacevic origin
+holger at piu-slave-bm-a$ sudo su - piupartss update-piuparts-slave-setup bikeshed origin
 ----
 
 == Running piuparts
diff --git a/TODO b/TODO
index cd5e989..fce3487 100644
--- a/TODO
+++ b/TODO
@@ -28,11 +28,6 @@ for 0.5x:
   (since it may be used for remote ssh access to run the slave)
   granting permissions to %piuparts works against this
 
-- re-read all documentation carefully and update were needed.
-  - update+cleanup README_pejacevic
-
-- Drop update-piuparts-setup?
-
 - in maintainer view: sort buggy states up again
 
 - more stats and graphs:
@@ -47,17 +42,31 @@ for 0.5x:
 - add a sample config with all possible keys set to some useful value
   (like /usr/share/doc/apt/examples/configure-index.gz)
 
-- look for a solution to use the global debian mirror for debian-backports, too
-  to avoid hardcoding a specific mirror in distros.conf
+- look for a solution to use the global debian mirror for debian-backports,
+  too, to avoid hardcoding a specific mirror in distros.conf
 
-- sane default for known-problem-directory setting, or define it in piuparts.conf.sample
+- sane default for known-problem-directory setting, or define it in 
+  piuparts.conf.sample
 
 - maybe compress all logfiles
 
-- update references to piatti with ones to pejacevic
-
 - move counts.txt from htdocs to master
 
+- notes from pejacevic setup:
+  - the need for the symlink from /srv/piuparts.debian.org/etc/piuparts to
+    /etc/piuparts is awkward when everything else is in 
+    /srv/piuparts.debian.org
+  - (likewise that the slave logins as master, even with a restricted key...)
+  - use mirror via nfs (faster)
+  - do not use eatmydata (we're using tmpfs in RAM anyway, so installing it
+    just slows things down)
+  - ~/bin is not added to PATH
+
+- re-read all documentation carefully and update were needed.
+  - cleanup README_pejacevic
+
+- Drop update-piuparts-setup?
+
 
 for 0.6x:
 
@@ -125,8 +134,8 @@ for 0.7x and later:
   - RSS feeds of logs
   - do more fancy R graphs, eg. also per state
   - sort packages on maintainer pages alphabetically (states first though)
-  - link (and target) to piuparts.d.o configuration is static to piatti. should
-    refer to the actual hosts configuration, eg goldwassers
+  - link (and target) to piuparts.d.o configuration is static to pejacevic. should
+    refer to the actual hosts configuration if running somewhere else
 
 - a redirect of http://piuparts.d.o/foo to http://p.d.o/source/f/foo.html would
   be nice
diff --git a/debian/changelog b/debian/changelog
index 5378545..9f7e8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,6 +91,13 @@ 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.
+  * 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/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/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.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/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.piatti b/instances/piuparts.conf.pejacevic
similarity index 92%
copy from instances/piuparts.conf.piatti
copy to instances/piuparts.conf.pejacevic
index 5d037b9..459ac85 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.pejacevic
@@ -1,7 +1,7 @@
 #
-# This is the configuration file for piuparts running in master-slave mode on piatti.debian.org
+# This is the configuration file for piuparts running in master-slave mode on pejacevic.debian.org (as master)
 #
-# 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 http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob;f=README_pejacevic.txt
 #
 
 [DEFAULT]
@@ -68,15 +68,14 @@ sections =
 	sid2experimental
 	jessie
 #	wheezy2jessie
-#	wheezy2bpo2jessie
 	wheezy
 	squeeze2wheezy
 	squeeze2bpo2wheezy
 	squeeze
 	lenny2squeeze
 #
-mirror = http://piatti.debian.org/debian/
-master-host = localhost
+mirror = http://mirror.bm.debian.org/debian/
+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
@@ -162,19 +161,6 @@ upgrade-test-distros = wheezy jessie
 log-file = wheezy2jessie.log
 
 
-[wheezy2bpo2jessie]
-precedence = 4
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-wheezy)s
-depends-sections = wheezy
-arch = amd64
-area = main
-distro = wheezy-backports
-upgrade-test-distros = wheezy wheezy-backports jessie
-log-file = wheezy2bpo2jessie.log
-
-
 [wheezy]
 precedence = 2
 piuparts-flags =
@@ -205,10 +191,11 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-wheezy)s
 depends-sections = squeeze
+distro = squeeze-backports
 arch = amd64
 area = main
-distro = squeeze-backports
 upgrade-test-distros = squeeze squeeze-backports wheezy
+upgrade-test-chroot-tgz = squeeze.tar.gz
 log-file = squeeze2bpo2wheezy.log
 
 
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piu-slave-bm-a
similarity index 92%
copy from instances/piuparts.conf.piatti
copy to instances/piuparts.conf.piu-slave-bm-a
index 5d037b9..42a351d 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piu-slave-bm-a
@@ -1,7 +1,8 @@
 #
-# This is the configuration file for piuparts running in master-slave mode on piatti.debian.org
+# This is the configuration file for piuparts running in master-slave mode on piu-slave-bm-a.debian.org as slave. 
+# For now we just run one slave on this host, soon thereafter we'll run two :)
 #
-# 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 http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=develop;a=blob;f=README_pejacevic.txt
 #
 
 [DEFAULT]
@@ -68,15 +69,14 @@ sections =
 	sid2experimental
 	jessie
 #	wheezy2jessie
-#	wheezy2bpo2jessie
 	wheezy
 	squeeze2wheezy
 	squeeze2bpo2wheezy
 	squeeze
 	lenny2squeeze
 #
-mirror = http://piatti.debian.org/debian/
-master-host = localhost
+mirror = http://mirror.bm.debian.org/debian/
+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
@@ -162,19 +162,6 @@ upgrade-test-distros = wheezy jessie
 log-file = wheezy2jessie.log
 
 
-[wheezy2bpo2jessie]
-precedence = 4
-piuparts-flags =
-	%(flags-default)s
-	%(flags-start-wheezy)s
-depends-sections = wheezy
-arch = amd64
-area = main
-distro = wheezy-backports
-upgrade-test-distros = wheezy wheezy-backports jessie
-log-file = wheezy2bpo2jessie.log
-
-
 [wheezy]
 precedence = 2
 piuparts-flags =
@@ -205,10 +192,11 @@ piuparts-flags =
 	%(flags-start-squeeze)s
 	%(flags-end-wheezy)s
 depends-sections = squeeze
+distro = squeeze-backports
 arch = amd64
 area = main
-distro = squeeze-backports
 upgrade-test-distros = squeeze squeeze-backports wheezy
+upgrade-test-chroot-tgz = squeeze.tar.gz
 log-file = squeeze2bpo2wheezy.log
 
 
diff --git a/piuparts-report.py b/piuparts-report.py
index 996ca2a..228bb6f 100644
--- a/piuparts-report.py
+++ b/piuparts-report.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright 2005 Lars Wirzenius (liw at iki.fi)
-# Copyright 2009-2012 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
 # Copyright © 2011-2013 Andreas Beckmann (anbe at debian.org)
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -121,8 +121,10 @@ HTML_HEADER = """
     <tr class="normalrow">
      <td class="contentcell">
       piuparts.d.o configuration:<br>
-      <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=blob_plain;f=instances/piuparts.conf.piatti" target="_blank">piuparts.conf.piatti</a><br>
-      <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=piatti;a=tree;f=custom-scripts" target="_blank">scripts</a>
+      <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob_plain;f=instances/piuparts.conf.pejacevic" target="_blank">piuparts.conf.pejacevic</a><br>
+      <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob_plain;f=instances/piuparts.conf.piu-slave-bm-a" target="_blank">piuparts.conf.piu-slave-bm-a</a><br>
+      <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=blob_plain;f=conf/distros.conf" target="_blank">distros.conf</a><br>
+      <a href="http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=bikeshed;a=tree;f=custom-scripts" target="_blank">scripts</a>
      </td>
     </tr>
     <tr class="normalrow">
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-setup b/update-piuparts-master-setup
similarity index 66%
copy from update-piuparts-setup
copy to update-piuparts-master-setup
index 34991e9..47f91c0 100755
--- a/update-piuparts-setup
+++ b/update-piuparts-master-setup
@@ -2,7 +2,7 @@
 set -e
 
 #
-#  update piuparts setup on piatti.debian.org
+#  update piuparts master setup from git (eg. used on pejacevic.debian.org)
 #
 
 # Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
@@ -21,8 +21,8 @@ set -e
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-if [ "`id -n -u`" != "piupartss" ] ; then
-        echo please run this script as piupartss user
+if [ "`id -n -u`" != "piupartsm" ] ; then
+        echo please run this script as piupartsm user
         exit 1
 fi
 
@@ -30,18 +30,12 @@ PIUPARTS_PREFIX=/srv/piuparts.debian.org
 PIUPARTS_HTDOCS=$PIUPARTS_PREFIX/htdocs
 PIUPARTS_TMPDIR=$PIUPARTS_PREFIX/tmp
 
-# please cleanup yourself
-cd
-if [ -d piatti ] ; then
-	echo please rm ~/piatti manually
-fi
-
 #
 # create $PIUPARTS_PREFIX
 #
 if [ ! -d $PIUPARTS_PREFIX ] ; then
 	sudo mkdir -p $PIUPARTS_PREFIX
-	sudo chown piupartss:piuparts $PIUPARTS_PREFIX
+	sudo chown piupartsm:piuparts $PIUPARTS_PREFIX
 	sudo chmod 0775 $PIUPARTS_PREFIX
 fi
 
@@ -75,7 +69,7 @@ fi
 make clean
 make		prefix=$PIUPARTS_PREFIX \
 		build build-doc
-sudo make	prefix=$PIUPARTS_PREFIX \
+make	prefix=$PIUPARTS_PREFIX \
 		docdir=$PIUPARTS_HTDOCS/doc \
 		htdocsdir=$PIUPARTS_HTDOCS \
 		install install-doc install-conf-4-running-from-git
@@ -87,12 +81,8 @@ make clean
 #
 for icon in weather-severe-alert.png sunny.png
 do
-	if [ -h $PIUPARTS_HTDOCS/images/$icon ] ; then
-		sudo rm -f $PIUPARTS_HTDOCS/images/$icon
-	fi
-
 	if [ -e /usr/share/icons/Tango/24x24/status/$icon ] ; then
-		sudo cp -f /usr/share/icons/Tango/24x24/status/$icon $PIUPARTS_HTDOCS/images/$icon
+		cp -f /usr/share/icons/Tango/24x24/status/$icon $PIUPARTS_HTDOCS/images/$icon
 	fi
 done
 
@@ -101,16 +91,11 @@ done
 #
 cd $PIUPARTS_PREFIX
 pwd
-mkdir -p master slave slave/basetgz backup
-sudo chown piupartss:piuparts slave slave/basetgz
-sudo chown piupartsm:piuparts master htdocs backup
+mkdir -p master backup
 # to support multiple hosts with this setup
-cd $PIUPARTS_PREFIX/etc/piuparts
-pwd
-sudo chown piupartss:piuparts . piuparts.conf.*
-chmod 0664 piuparts.conf.*
+cd etc/piuparts
 HOSTNAME=$(hostname)
-for f in piuparts.conf forward
+for f in piuparts.conf
 do
 	ln -sf $f.$HOSTNAME $f
 done
@@ -121,26 +106,11 @@ done
 mkdir -p $PIUPARTS_TMPDIR
 
 #
-# update slave home
+# update master home
 #
 cd
 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
-
-#
-# update master home
-#
-ssh piupartsm at localhost "
-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
-"
 
 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-setup b/update-piuparts-slave-setup
similarity index 64%
copy from update-piuparts-setup
copy to update-piuparts-slave-setup
index 34991e9..e564bfc 100755
--- a/update-piuparts-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)
@@ -30,12 +30,6 @@ PIUPARTS_PREFIX=/srv/piuparts.debian.org
 PIUPARTS_HTDOCS=$PIUPARTS_PREFIX/htdocs
 PIUPARTS_TMPDIR=$PIUPARTS_PREFIX/tmp
 
-# please cleanup yourself
-cd
-if [ -d piatti ] ; then
-	echo please rm ~/piatti manually
-fi
-
 #
 # create $PIUPARTS_PREFIX
 #
@@ -75,42 +69,22 @@ fi
 make clean
 make		prefix=$PIUPARTS_PREFIX \
 		build build-doc
-sudo make	prefix=$PIUPARTS_PREFIX \
+make	prefix=$PIUPARTS_PREFIX \
 		docdir=$PIUPARTS_HTDOCS/doc \
 		htdocsdir=$PIUPARTS_HTDOCS \
 		install install-doc install-conf-4-running-from-git
 make clean
 
 #
-# install copies of the weather icons
-# to avoid needing FollowSymlinks in the apache config
-#
-for icon in weather-severe-alert.png sunny.png
-do
-	if [ -h $PIUPARTS_HTDOCS/images/$icon ] ; then
-		sudo rm -f $PIUPARTS_HTDOCS/images/$icon
-	fi
-
-	if [ -e /usr/share/icons/Tango/24x24/status/$icon ] ; then
-		sudo cp -f /usr/share/icons/Tango/24x24/status/$icon $PIUPARTS_HTDOCS/images/$icon
-	fi
-done
-
-#
 # update $PIUPARTS_PREFIX
 #
 cd $PIUPARTS_PREFIX
 pwd
-mkdir -p master slave slave/basetgz backup
-sudo chown piupartss:piuparts slave slave/basetgz
-sudo chown piupartsm:piuparts master htdocs backup
+mkdir -p slave slave/basetgz
 # to support multiple hosts with this setup
-cd $PIUPARTS_PREFIX/etc/piuparts
-pwd
-sudo chown piupartss:piuparts . piuparts.conf.*
-chmod 0664 piuparts.conf.*
+cd etc/piuparts
 HOSTNAME=$(hostname)
-for f in piuparts.conf forward
+for f in piuparts.conf
 do
 	ln -sf $f.$HOSTNAME $f
 done
@@ -125,22 +99,7 @@ mkdir -p $PIUPARTS_TMPDIR
 #
 cd
 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
 
-#
-# update master home
-#
-ssh piupartsm at localhost "
-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
-"
-
 echo "Update finished."

-- 
piuparts git repository

More information about the Piuparts-commits mailing list