[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.50-113-gfcf6c48

Sat May 4 20:56:34 UTC 2013

The following commit has been merged in the develop branch:
commit fcf6c482d3376b2e7a29b70aa7d75e4fe8425916
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat May 4 22:56:30 2013 +0200

    Use /srv/piuparts.debian.org/ on piatti.debian.org as per DSA policy.

diff --git a/README_piatti.txt b/README_piatti.txt
index 174ee87..bbd9401 100644
--- a/README_piatti.txt
+++ b/README_piatti.txt
@@ -11,7 +11,7 @@ Notes about the piuparts installation on piatti.debian.org
 
 === User setup
 
-A piupartss and a piupartsm user is need. Both are members of the group piuparts and /org/piuparts.debian.org is 774 piupartss:piuparts.
+A piupartss and a piupartsm user is need. 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.
 
 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.
@@ -31,9 +31,9 @@ piupartss       ALL = NOPASSWD: ALL
 
 * sudo apt-get install apt python debootstrap lsof lsb-release python-debian asciidoc xmlto python-rpy r-recommended r-base-dev gs
 * you need a webserver too, if you run the master
-* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=develop;a=blob_plain;f=update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/org/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
-* mkdir /org/piuparts.debian.org
-* sudo ln -s /org/piuparts.debian.org/etc/piuparts /etc/piuparts
+* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piuparts.git;hb=develop;a=blob_plain;f=update-piuparts-setup' on the host and run it under the 'piupartss' user. It assumes you want to set it up in '/srv/piuparts.debian.org' and does all further updates from git as well as the initial installation. It needs the piupartss and piupartsm user set up as described below, though.
+* mkdir /srv/piuparts.debian.org
+* sudo ln -s /srv/piuparts.debian.org/etc/piuparts /etc/piuparts
 
 === Apache configuration
 
@@ -48,7 +48,7 @@ piupartss       ALL = NOPASSWD: ALL
         ErrorLog /var/log/apache2/piuparts.debian.org-error.log
         CustomLog /var/log/apache2/piuparts.debian.org-access.log combined
 
-        DocumentRoot /org/piuparts.debian.org/htdocs
+        DocumentRoot /srv/piuparts.debian.org/htdocs
 
         DefaultType text/plain
 
@@ -64,7 +64,7 @@ piupartss       ALL = NOPASSWD: ALL
 == Updating the piuparts installation
 
 ----
-piupartss at piatti:/org/piuparts.debian.org$ ~/bin/update-piuparts-setup
+piupartss at piatti:/srv/piuparts.debian.org$ ~/bin/update-piuparts-setup
 ----
 
 == Running piuparts
diff --git a/debian/changelog b/debian/changelog
index 2f30898..47fb1ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -81,6 +81,7 @@ piuparts (0.51) UNRELEASED; urgency=low
   * slave_run:
     - 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.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 16 Mar 2013 00:14:13 +0100
 
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index abfa85b..c962b7a 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -57,20 +57,20 @@ mirror = http://ftp.de.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
-master-command = /org/piuparts.debian.org/share/piuparts/piuparts-master
+master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
 piuparts-command =
 	sudo
 	env PYTHONPATH=%(PYTHONPATH)s
 	timeout -s INT -k 5m 35m
-	/org/piuparts.debian.org/sbin/piuparts
-PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
-master-directory = /org/piuparts.debian.org/master
-slave-directory = /org/piuparts.debian.org/slave
-basetgz-directory = /org/piuparts.debian.org/slave/basetgz
-output-directory = /org/piuparts.debian.org/htdocs
-known-problem-directory = /org/piuparts.debian.org/share/piuparts/known_problems
-backup-directory = /org/piuparts.debian.org/backup
-tmpdir = /org/piuparts.debian.org/tmp
+	/srv/piuparts.debian.org/sbin/piuparts
+PYTHONPATH = /srv/piuparts.debian.org/lib/python2.6/dist-packages:/srv/piuparts.debian.org/lib/python2.7/dist-packages
+master-directory = /srv/piuparts.debian.org/master
+slave-directory = /srv/piuparts.debian.org/slave
+basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
+output-directory = /srv/piuparts.debian.org/htdocs
+known-problem-directory = /srv/piuparts.debian.org/share/piuparts/known_problems
+backup-directory = /srv/piuparts.debian.org/backup
+tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
 # this value is too high for production (it will cause piuparts-slave to sleep
 # for a whole day) but useful for testing master-slave mode, for running on a
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index 0715265..1b523bb 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -76,20 +76,20 @@ mirror = http://piatti.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
-master-command = /org/piuparts.debian.org/share/piuparts/piuparts-master
+master-command = /srv/piuparts.debian.org/share/piuparts/piuparts-master
 piuparts-command =
 	sudo
 	env PYTHONPATH=%(PYTHONPATH)s
 	timeout -s INT -k 5m 35m
-	/org/piuparts.debian.org/sbin/piuparts
-PYTHONPATH = /org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages
-master-directory = /org/piuparts.debian.org/master
-slave-directory = /org/piuparts.debian.org/slave
-basetgz-directory = /org/piuparts.debian.org/slave/basetgz
-output-directory = /org/piuparts.debian.org/htdocs
-known-problem-directory = /org/piuparts.debian.org/share/piuparts/known_problems
-backup-directory = /org/piuparts.debian.org/backup
-tmpdir = /org/piuparts.debian.org/tmp
+	/srv/piuparts.debian.org/sbin/piuparts
+PYTHONPATH = /srv/piuparts.debian.org/lib/python2.6/dist-packages:/srv/piuparts.debian.org/lib/python2.7/dist-packages
+master-directory = /srv/piuparts.debian.org/master
+slave-directory = /srv/piuparts.debian.org/slave
+basetgz-directory = /srv/piuparts.debian.org/slave/basetgz
+output-directory = /srv/piuparts.debian.org/htdocs
+known-problem-directory = /srv/piuparts.debian.org/share/piuparts/known_problems
+backup-directory = /srv/piuparts.debian.org/backup
+tmpdir = /srv/piuparts.debian.org/tmp
 doc-root = /
 # 30*60
 idle-sleep = 1800
diff --git a/update-piuparts-setup b/update-piuparts-setup
index 36c97f0..34991e9 100755
--- a/update-piuparts-setup
+++ b/update-piuparts-setup
@@ -5,7 +5,7 @@ set -e
 #  update piuparts setup on piatti.debian.org
 #
 
-# Copyright 2009-2012 Holger Levsen (holger at layer-acht.org)
+# Copyright 2009-2013 Holger Levsen (holger at layer-acht.org)
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -26,7 +26,7 @@ if [ "`id -n -u`" != "piupartss" ] ; then
         exit 1
 fi
 
-PIUPARTS_PREFIX=/org/piuparts.debian.org
+PIUPARTS_PREFIX=/srv/piuparts.debian.org
 PIUPARTS_HTDOCS=$PIUPARTS_PREFIX/htdocs
 PIUPARTS_TMPDIR=$PIUPARTS_PREFIX/tmp
 

-- 
piuparts git repository

