[Piuparts-commits] [SCM] piatti.debian.org configuration files branch, master, updated. 148332ef45997ba3aaf38cc2c9a28441083bad49

Holger Levsen holger at layer-acht.org
Fri Dec 23 10:23:37 UTC 2011 

The following commit has been merged in the master branch:
commit 3742b6da927b4c6fbe5a122c89fcc66d861399c9
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Sep 26 21:04:13 2011 +0200

    s#svn#git# and some config updates

diff --git a/README.txt b/README.txt
index 648b920..cf888a6 100644
--- a/README.txt
+++ b/README.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.
-Both user have some files in $HOME which are kept in svn, including hidden files.
+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.
 
@@ -26,11 +26,11 @@ piupartss       ALL=(ALL) NOPASSWD: ALL
 %piuparts       ALL=(piupartsm) ALL
 ---
 
-=== piuparts installation from svn source
+=== piuparts installation from source
 
 * sudo apt-get install apt python debootstrap lsof lsb-release python-debian make dpkg-dev python-support asciidoc xmlto python-rpy r-recommended r-base-dev gs
 * you need a webserver too, if you run the master
-* Copy 'svn://svn.debian.org/svn/piuparts/piatti/home/piupartss/bin/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 svn checkouts as well as source code installation. It needs the piupartss and piupartsm user set up as described below, though.
+* Copy 'http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=home/piupartss/bin/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/ /etc/piuparts
 	
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
index 2dee425..f70f319 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
+++ b/org/piuparts.debian.org/etc/piuparts.conf.goldwasser
@@ -1,18 +1,21 @@
 #
 # This is the configuration file for piuparts running in master-slave mode on a host called goldwasser
 # 
-# For more information on this setup see http://svn.debian.org/viewsvn/piuparts/piatti/README.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=README.txt
 #
 #
 
 [global]
-#sections = squeeze sid lenny2squeeze
-sections = lenny2squeeze
+#sections = wheezy sid squeeze2wheezy
+sections = squeeze2wheezy
 master-host = localhost
 master-user = piupartsm
 master-directory = /org/piuparts.debian.org/master/
 output-directory = /org/piuparts.debian.org/htdocs/
-idle-sleep = 1800
+# 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
+idle-sleep = 86400
 
 [sid]
 description = Debian sid / main: package installation, removal and purge test.
@@ -20,7 +23,7 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 packages-url = http://ftp.de.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/sid/main/source/Sources.bz2
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = sid
 chroot-tgz = sid.tar.gz
 max-reserved = 5
@@ -38,36 +41,23 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 packages-url = http://ftp.de.debian.org/debian/dists/wheezy/main/binary-amd64/Packages.bz2
 sources-url = http://ftp.de.debian.org/debian/dists/wheezy/main/source/Sources.bz2
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = wheezy
 chroot-tgz = wheezy.tar.gz
 max-reserved = 5
 log-file = wheezy.log
 known_circular_depends = libc6 libgcc1 debconf debconf-english debconf-i18n abuse abuse-frabs abuse-lib perl perl-modules odbcinst odbcinst1debian2 g++-4.4 libstdc++6-4.4-dev xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-evdev xserver-xorg-input-synaptics xserver-xorg-input-wacom xserver-xorg-video-all xserver-xorg-video-apm xserver-xorg-video-ark xserver-xorg-video-ati xserver-xorg-video-chips xserver-xorg-video-cirrus xserver-xorg-video-fbdev xserver-xorg-video-geode xserver-xorg-video-i128 xserver-xorg-video-i740 xserver-xorg-video-intel xserver-xorg-video-mach64 xserver-xorg-video-mga xserver-xorg-video-neomagic xserver-xorg-video-nouveau xserver-xorg-video-nv xserver-xorg-video-openchrome xserver-xorg-video-r128 xserver-xorg-video-radeon xserver-xorg-video-rendition xserver-xorg-video-s3 xserver-xorg-video-s3virge xserver-xorg-video-savage xserver-xorg-video-siliconmotion xserver-xorg-video-sis xserver-xorg-video-sisusb xserver-xorg-video-tdfx xserver-xorg-video-trident xserver-xorg-video-tseng xserver-xorg-video-vesa xserver-xorg-video-vmware xserver-xorg-video-voodoo fglrx-driver fglrx-glx ca-certificates-java openjdk-6-jre-headless openjdk-6-jre-lib sun-java6-bin sun-java6-jre default-jre libaccess-bridge-java libaccess-bridge-java-jni openjdk-6-jre dmsetup libdevmapper1.02.1 uqm uqm-content acheck acheck-rules console-common kbd aide aide-common exim4 exim4-base exim4-daemon-heavy exim4-daemon-light fcron libmono-corlib2.0-cil libmono-posix2.0-cil libmono-security2.0-cil libmono-system2.0-cil mono-2.0-gac mono-gac mono-runtime libmono-system-data-linq2.0-cil libmono-system-web2.0-cil libmono-wcf3.0-cil libmono2.0-cil gamin libgamin0 xemacs21 xemacs21-bin xemacs21-mule xemacs21-mule-canna-wnn xemacs21-nomule xemacs21-support python-imaging python-imaging-tk monodoc-browser monodoc-http monodoc-manual iamerican ispell bible-kjv bible-kjv-text bochs bochs-wx g++-4.3 libstdc++6-4.3-dev bootcd bootcd-hppa bootcd-i386 bootcd-ia64 libcherokee-config0 libcherokee-server0 cowbuilder cowdancer cyrus-sasl2-dbg cyrus-sasl2-heimdal-dbg cyrus-sasl2-mit-dbg tasksel tasksel-data python-netcdf python-scientific gcj-4.4-jdk libgcj10-dev gdc-4.3 libphobos-4.3-dev pcb-common pcb-gtk pcb-lesstif ggz-gtk-games ggz-gtk-games-data ggz-kde-games ggz-kde-games-data ggz-sdl-games ggz-sdl-games-data gnuift gnuift-perl heroes-common heroes-ggi heroes-sdl kchart koffice-libs strongswan-ikev1 strongswan-ikev2 strongswan-nm strongswan-starter cli-uno-bridge libuno-cli-cppuhelper1.0-cil klogd sysklogd 
  
-[squeeze]
-description = Debian squeeze / main: package installation, removal and purge test.
-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 squeeze
-packages-url = http://ftp.de.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
-sources-url = http://ftp.de.debian.org/debian/dists/squeeze/main/source/Sources.bz2
-mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
-distro = squeeze
-chroot-tgz = squeeze.tar.gz
-max-reserved = 5
-log-file = squeeze.log
-known_circular_depends = libc6 libgcc1 debconf debconf-english debconf-i18n abuse abuse-frabs abuse-lib perl perl-modules odbcinst odbcinst1debian2 g++-4.4 libstdc++6-4.4-dev xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-evdev xserver-xorg-input-synaptics xserver-xorg-input-wacom xserver-xorg-video-all xserver-xorg-video-apm xserver-xorg-video-ark xserver-xorg-video-ati xserver-xorg-video-chips xserver-xorg-video-cirrus xserver-xorg-video-fbdev xserver-xorg-video-geode xserver-xorg-video-i128 xserver-xorg-video-i740 xserver-xorg-video-intel xserver-xorg-video-mach64 xserver-xorg-video-mga xserver-xorg-video-neomagic xserver-xorg-video-nouveau xserver-xorg-video-nv xserver-xorg-video-openchrome xserver-xorg-video-r128 xserver-xorg-video-radeon xserver-xorg-video-rendition xserver-xorg-video-s3 xserver-xorg-video-s3virge xserver-xorg-video-savage xserver-xorg-video-siliconmotion xserver-xorg-video-sis xserver-xorg-video-sisusb xserver-xorg-video-tdfx xserver-xorg-video-trident xserver-xorg-video-tseng xserver-xorg-video-vesa xserver-xorg-video-vmware xserver-xorg-video-voodoo fglrx-driver fglrx-glx ca-certificates-java openjdk-6-jre-headless openjdk-6-jre-lib sun-java6-bin sun-java6-jre default-jre libaccess-bridge-java libaccess-bridge-java-jni openjdk-6-jre dmsetup libdevmapper1.02.1 uqm uqm-content acheck acheck-rules console-common kbd aide aide-common exim4 exim4-base exim4-daemon-heavy exim4-daemon-light fcron libmono-corlib2.0-cil libmono-posix2.0-cil libmono-security2.0-cil libmono-system2.0-cil mono-2.0-gac mono-gac mono-runtime libmono-system-data-linq2.0-cil libmono-system-web2.0-cil libmono-wcf3.0-cil libmono2.0-cil gamin libgamin0 xemacs21 xemacs21-bin xemacs21-mule xemacs21-mule-canna-wnn xemacs21-nomule xemacs21-support python-imaging python-imaging-tk monodoc-browser monodoc-http monodoc-manual iamerican ispell bible-kjv bible-kjv-text bochs bochs-wx g++-4.3 libstdc++6-4.3-dev bootcd bootcd-hppa bootcd-i386 bootcd-ia64 libcherokee-config0 libcherokee-server0 cowbuilder cowdancer cyrus-sasl2-dbg cyrus-sasl2-heimdal-dbg cyrus-sasl2-mit-dbg tasksel tasksel-data python-netcdf python-scientific gcj-4.4-jdk libgcj10-dev gdc-4.3 libphobos-4.3-dev pcb-common pcb-gtk pcb-lesstif ggz-gtk-games ggz-gtk-games-data ggz-kde-games ggz-kde-games-data ggz-sdl-games ggz-sdl-games-data gnuift gnuift-perl heroes-common heroes-ggi heroes-sdl kchart koffice-libs strongswan-ikev1 strongswan-ikev2 strongswan-nm strongswan-starter cli-uno-bridge libuno-cli-cppuhelper1.0-cil klogd sysklogd 
-
-[lenny2squeeze]
-description = Debian main: package installation in lenny and upgrade to squeeze, then removal and purge test.
-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 lenny2squeeze
-packages-url = http://ftp.de.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
-sources-url = http://ftp.de.debian.org/debian/dists/squeeze/main/source/Sources.bz2
+[squeeze2wheezy]
+description = Debian main: package installation in squeeze and upgrade to wheezy, then removal and purge test.
+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 squeeze2wheezy
+packages-url = http://ftp.de.debian.org/debian/dists/wheezy/main/binary-amd64/Packages.bz2
+sources-url = http://ftp.de.debian.org/debian/dists/wheezy/main/source/Sources.bz2
 mirror = http://ftp.de.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --dpkg-noforce-unsafe-io --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
-upgrade-test-distros = lenny squeeze
-upgrade-test-chroot-tgz = lenny.tar.gz
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --dpkg-noforce-unsafe-io --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+upgrade-test-distros = squeeze wheezy
+upgrade-test-chroot-tgz = squeeze.tar.gz
 max-reserved = 5
-log-file = lenny2squeeze.log
+log-file = squeeze2wheezy.log
 known_circular_depends = libc6 libgcc1 debconf debconf-english debconf-i18n abuse abuse-frabs abuse-lib perl perl-modules odbcinst odbcinst1debian2 g++-4.4 libstdc++6-4.4-dev xserver-xorg xserver-xorg-core xserver-xorg-input-all xserver-xorg-input-evdev xserver-xorg-input-synaptics xserver-xorg-input-wacom xserver-xorg-video-all xserver-xorg-video-apm xserver-xorg-video-ark xserver-xorg-video-ati xserver-xorg-video-chips xserver-xorg-video-cirrus xserver-xorg-video-fbdev xserver-xorg-video-geode xserver-xorg-video-i128 xserver-xorg-video-i740 xserver-xorg-video-intel xserver-xorg-video-mach64 xserver-xorg-video-mga xserver-xorg-video-neomagic xserver-xorg-video-nouveau xserver-xorg-video-nv xserver-xorg-video-openchrome xserver-xorg-video-r128 xserver-xorg-video-radeon xserver-xorg-video-rendition xserver-xorg-video-s3 xserver-xorg-video-s3virge xserver-xorg-video-savage xserver-xorg-video-siliconmotion xserver-xorg-video-sis xserver-xorg-video-sisusb xserver-xorg-video-tdfx xserver-xorg-video-trident xserver-xorg-video-tseng xserver-xorg-video-vesa xserver-xorg-video-vmware xserver-xorg-video-voodoo fglrx-driver fglrx-glx ca-certificates-java openjdk-6-jre-headless openjdk-6-jre-lib sun-java6-bin sun-java6-jre default-jre libaccess-bridge-java libaccess-bridge-java-jni openjdk-6-jre dmsetup libdevmapper1.02.1 uqm uqm-content acheck acheck-rules console-common kbd aide aide-common exim4 exim4-base exim4-daemon-heavy exim4-daemon-light fcron libmono-corlib2.0-cil libmono-posix2.0-cil libmono-security2.0-cil libmono-system2.0-cil mono-2.0-gac mono-gac mono-runtime libmono-system-data-linq2.0-cil libmono-system-web2.0-cil libmono-wcf3.0-cil libmono2.0-cil gamin libgamin0 xemacs21 xemacs21-bin xemacs21-mule xemacs21-mule-canna-wnn xemacs21-nomule xemacs21-support python-imaging python-imaging-tk monodoc-browser monodoc-http monodoc-manual iamerican ispell bible-kjv bible-kjv-text bochs bochs-wx g++-4.3 libstdc++6-4.3-dev bootcd bootcd-hppa bootcd-i386 bootcd-ia64 libcherokee-config0 libcherokee-server0 cowbuilder cowdancer cyrus-sasl2-dbg cyrus-sasl2-heimdal-dbg cyrus-sasl2-mit-dbg tasksel tasksel-data python-netcdf python-scientific gcj-4.4-jdk libgcj10-dev gdc-4.3 libphobos-4.3-dev pcb-common pcb-gtk pcb-lesstif ggz-gtk-games ggz-gtk-games-data ggz-kde-games ggz-kde-games-data ggz-sdl-games ggz-sdl-games-data gnuift gnuift-perl heroes-common heroes-ggi heroes-sdl kchart koffice-libs strongswan-ikev1 strongswan-ikev2 strongswan-nm strongswan-starter cli-uno-bridge libuno-cli-cppuhelper1.0-cil klogd sysklogd 
 
diff --git a/org/piuparts.debian.org/etc/piuparts.conf.piatti b/org/piuparts.debian.org/etc/piuparts.conf.piatti
index dff63ee..5fb3b15 100644
--- a/org/piuparts.debian.org/etc/piuparts.conf.piatti
+++ b/org/piuparts.debian.org/etc/piuparts.conf.piatti
@@ -1,7 +1,7 @@
 #
 # This is the configuration file for piuparts running in master-slave mode on piatti.debian.org
 # 
-# For more information on this setup see http://svn.debian.org/viewsvn/piuparts/piatti/README.txt
+# For more information on this setup see http://anonscm.debian.org/gitweb/?p=piuparts/piatti.git;a=blob;f=README.txt
 #
 #
 
@@ -22,7 +22,7 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 packages-url = http://piatti.debian.org/debian/dists/sid/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/sid/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 # Once there are no packages left which leave files on purge behind, 
 # --pedantic-purge-test should be added
 distro = sid
@@ -39,7 +39,7 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 packages-url = http://piatti.debian.org/debian/dists/wheezy/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/wheezy/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = wheezy
 chroot-tgz = wheezy.tar.gz
 max-reserved = 100
@@ -52,7 +52,7 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
 max-reserved = 100
@@ -65,7 +65,7 @@ master-command = PYTHONPATH=/org/piuparts.debian.org/lib/python2.6/dist-packages
 packages-url = http://piatti.debian.org/debian/dists/squeeze/main/binary-amd64/Packages.bz2
 sources-url = http://piatti.debian.org/debian/dists/squeeze/main/source/Sources.bz2
 mirror = http://piatti.debian.org/debian/
-piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-symlinks --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --dpkg-noforce-unsafe-io --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
+piuparts-cmd = sudo /org/piuparts.debian.org/sbin/piuparts --warn-on-others --warn-on-leftovers-after-purge --skip-logrotatefiles-test --dpkg-noforce-unsafe-io --scriptsdir /etc/piuparts/scripts/ --tmpdir /org/piuparts.debian.org/tmp
 upgrade-test-distros = lenny squeeze
 upgrade-test-chroot-tgz = lenny.tar.gz
 max-reserved = 50

-- 
piatti.debian.org configuration files

More information about the Piuparts-commits mailing list