[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.49-194-g6f9dd07

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 8a5cbeb9c11dbb8d82e19d2e9486d581d71bda96
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 10 10:07:36 2013 +0100

    p.conf.sample: activate a default mirror
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/TODO b/TODO
index 008200d..830badb 100644
--- a/TODO
+++ b/TODO
@@ -29,7 +29,7 @@ for 0.5x:
 
 - merge/cleanup README_piatti.txt and README_server.txt?
 
-- use cdn.debian.net as mirror default (instead of "your.mirror.here") and
+- use cdn.debian.net as mirror default and
   provide a debconf template to overwrite this.  or http.debian.net ?
 
 - in maintainer view: sort buggy states up again
diff --git a/conf/piuparts.conf.sample b/conf/piuparts.conf.sample
index 906ab84..9d3bb33 100644
--- a/conf/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -2,11 +2,12 @@
 # This is the configuration file for piuparts running in master-slave mode.
 #
 # You MUST make sure that master-host, master-user, master-directory, and
-# mirror are also set correctly.
+# mirror are set correctly.
 #
 
 [global]
 sections = sid
+mirror = http://cdn.debian.net/debian
 master-host = localhost
 master-user = piupartsm
 master-command = /usr/share/piuparts/piuparts-master
@@ -19,6 +20,7 @@ tmpdir = /var/cache/piuparts/tmp
 doc-root = /piuparts/
 idle-sleep = 300
 max-tgz-age = 604800
+max-reserved = 50
 expire-old-days = 120
 reschedule-old-days = 90
 reschedule-old-count = 150
@@ -31,19 +33,15 @@ reschedule-fail-count = 25
 precedence = 1
 description = "Debian sid / main"
 piuparts-flags = --no-symlinks
-# mirror = http://cdn.debian.net/debian
 distro = sid
 # area = main
 # arch = amd64
-chroot-tgz = sid.tar.gz
 upgrade-test-distros =
-max-reserved = 50
 debug = no
 
 
 ## another example:
 ## [s-p-u-i386]
-## # mirror = http://cdn.debian.net/debian
 ## distro = stable-proposed-updates
 ## # area = main
 ## arch = i386

-- 
piuparts git repository