[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.49-105-gac1319a

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit e85c1dd2af10e998511d89adc432675cbabde134
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat Feb 23 17:36:59 2013 +0100

    p.conf: reorder/reformat some config settings
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index fde1b91..80fc58a 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -1,26 +1,21 @@
 #
 # This is the configuration file for piuparts running in master-slave mode.
 #
-# The sample file does not set all required values, to prevent the
-# master from being run accidentally.
-#
 # You MUST make sure that master-host, master-user, master-directory, and
-# mirror are also set correctly. The sample file does not set it at
-# all, to prevent the master from being run accidentally.
-#
+# mirror are also set correctly.
 #
 
 [global]
 sections = sid
 master-host = localhost
 master-user = piupartsm
+master-command = python /usr/share/piuparts/piuparts-master
+piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
 master-directory = /var/lib/piuparts/master
 slave-directory = /var/lib/piuparts/slave
 output-directory = /var/lib/piuparts/htdocs
-doc-root = /piuparts/
-master-command = python /usr/share/piuparts/piuparts-master
-piuparts-command = sudo piuparts --scriptsdir /etc/piuparts/scripts
 tmpdir = /var/cache/piuparts/tmp
+doc-root = /piuparts/
 idle-sleep = 300
 max-tgz-age = 604800
 expire-old-days = 120
diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index 6ecf775..ea36368 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -8,19 +8,20 @@
 [global]
 #sections = sid wheezy squeeze2wheezy testing2sid
 sections = wheezy
+#
+mirror = http://ftp.de.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 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/
+master-directory = /org/piuparts.debian.org/master
 slave-directory = /org/piuparts.debian.org/slave
-output-directory = /org/piuparts.debian.org/htdocs/
+output-directory = /org/piuparts.debian.org/htdocs
 backup-directory = /org/piuparts.debian.org/backup
+tmpdir = /org/piuparts.debian.org/tmp
 doc-root = /
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
 piuparts-command = sudo /org/piuparts.debian.org/sbin/piuparts --skip-logrotatefiles-test --warn-on-others --scriptsdir /etc/piuparts/scripts
-tmpdir = /org/piuparts.debian.org/tmp
-mirror = http://ftp.de.debian.org/debian/
 # 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
 # test system 24/7 without causing load for 24/7
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index 8a41f95..a24130a 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -7,19 +7,20 @@
 
 [global]
 sections = sid testing2sid wheezy squeeze2wheezy squeeze lenny2squeeze
+#
+mirror = http://piatti.debian.org/debian/
 master-host = localhost
 master-user = piupartsm
 bts-from = piuparts-devel at lists.alioth.debian.org
 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/
+master-directory = /org/piuparts.debian.org/master
 slave-directory = /org/piuparts.debian.org/slave
-output-directory = /org/piuparts.debian.org/htdocs/
+output-directory = /org/piuparts.debian.org/htdocs
 backup-directory = /org/piuparts.debian.org/backup
+tmpdir = /org/piuparts.debian.org/tmp
 doc-root = /
 master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages:/org/piuparts.debian.org/lib/python2.7/dist-packages python /org/piuparts.debian.org/share/piuparts/piuparts-master
 piuparts-command = sudo /org/piuparts.debian.org/sbin/piuparts --skip-logrotatefiles-test --warn-on-others --scriptsdir /etc/piuparts/scripts
-tmpdir = /org/piuparts.debian.org/tmp
-mirror = http://piatti.debian.org/debian/
 # 30*60
 idle-sleep = 1800
 # 60*60*24*7

-- 
piuparts git repository