[Piuparts-commits] rev 118 - in fai-config-dir: class files/etc files/etc/apache2/sites-available files/etc/apache2/sites-available/default files/etc/apache2/sites-available/piuparts.cs.helsinki.fi files/etc/apt/preferences files/etc/apt/sources.list files/etc/piuparts files/etc/piuparts/piuparts-master.conf files/etc/piuparts/piuparts-report.conf files/etc/piuparts/piuparts-slave.conf files/var/www/index.html scripts scripts/DEFAULT scripts/PIUPARTS

Holger Levsen holger at alioth.debian.org
Sat Dec 22 17:54:38 UTC 2007


Author: holger
Date: 2007-12-22 17:54:38 +0000 (Sat, 22 Dec 2007)
New Revision: 118

Added:
   fai-config-dir/files/etc/apache2/sites-available/default/
   fai-config-dir/files/etc/apache2/sites-available/default/piatti
   fai-config-dir/files/etc/piuparts/
   fai-config-dir/files/etc/piuparts/piuparts-master.conf/
   fai-config-dir/files/etc/piuparts/piuparts-master.conf/PIUPARTS
   fai-config-dir/files/etc/piuparts/piuparts-report.conf/
   fai-config-dir/files/etc/piuparts/piuparts-report.conf/PIUPARTS
   fai-config-dir/files/etc/piuparts/piuparts-slave.conf/
   fai-config-dir/files/etc/piuparts/piuparts-slave.conf/PIUPARTS
   fai-config-dir/scripts/PIUPARTS/
   fai-config-dir/scripts/PIUPARTS/10-configure
Modified:
   fai-config-dir/class/50-host-classes
   fai-config-dir/files/etc/apache2/sites-available/piuparts.cs.helsinki.fi/WEBSERVER
   fai-config-dir/files/etc/apt/preferences/piatti
   fai-config-dir/files/etc/apt/sources.list/piatti
   fai-config-dir/files/var/www/index.html/piatti
   fai-config-dir/scripts/DEFAULT/90-apt
Log:
- new fai class PIUPARTS
- copies piuparts configs
- pin piuparts and debian-archive-keyring from sid
- expose the mirror to http://localhost for now
- apache finetuning


Modified: fai-config-dir/class/50-host-classes
===================================================================
--- fai-config-dir/class/50-host-classes	2007-12-22 17:01:29 UTC (rev 117)
+++ fai-config-dir/class/50-host-classes	2007-12-22 17:54:38 UTC (rev 118)
@@ -5,7 +5,7 @@
 # use a list of classes for our demo machine
 case $HOSTNAME in
     piatti)
-	echo 	"ADMINGROUP FIREWALL WEBSERVER" ;;
+	echo 	"ADMINGROUP FIREWALL WEBSERVER PIUPARTS" ;;
     *)
 	echo "DEFAULT" ;;
 esac

Added: fai-config-dir/files/etc/apache2/sites-available/default/piatti
===================================================================
--- fai-config-dir/files/etc/apache2/sites-available/default/piatti	                        (rev 0)
+++ fai-config-dir/files/etc/apache2/sites-available/default/piatti	2007-12-22 17:54:38 UTC (rev 118)
@@ -0,0 +1,55 @@
+NameVirtualHost *
+<VirtualHost *>
+	ServerAdmin webmaster at localhost
+	
+	DocumentRoot /var/www/
+	<Directory />
+		Options FollowSymLinks
+		AllowOverride None
+	</Directory>
+	<Directory /var/www/>
+		Options Indexes FollowSymLinks MultiViews
+		AllowOverride None
+		Order allow,deny
+		allow from all
+		# This directive allows us to have apache2's default start page
+                # in /apache2-default/, but still have / go to the right place
+                RedirectMatch ^/$ /apache2-default/
+	</Directory>
+
+	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
+	<Directory "/usr/lib/cgi-bin">
+		AllowOverride None
+		Options ExecCGI -MultiViews +SymLinksIfOwnerMatch
+		Order allow,deny
+		Allow from all
+	</Directory>
+
+	ErrorLog /var/log/apache2/error.log
+
+	# Possible values include: debug, info, notice, warn, error, crit,
+	# alert, emerg.
+	LogLevel warn
+
+	CustomLog /var/log/apache2/access.log combined
+	ServerSignature On
+
+    Alias /doc/ "/usr/share/doc/"
+    <Directory "/usr/share/doc/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+    </Directory>
+
+    Alias /debian/ "/org/mirror/"
+    <Directory "/org/mirror/">
+        Options Indexes MultiViews FollowSymLinks
+        AllowOverride None
+        Order deny,allow
+        Deny from all
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+    </Directory>
+
+</VirtualHost>

Modified: fai-config-dir/files/etc/apache2/sites-available/piuparts.cs.helsinki.fi/WEBSERVER
===================================================================
--- fai-config-dir/files/etc/apache2/sites-available/piuparts.cs.helsinki.fi/WEBSERVER	2007-12-22 17:01:29 UTC (rev 117)
+++ fai-config-dir/files/etc/apache2/sites-available/piuparts.cs.helsinki.fi/WEBSERVER	2007-12-22 17:54:38 UTC (rev 118)
@@ -25,4 +25,39 @@
 	CustomLog /var/log/apache2/access.log combined
 	ServerSignature On
 
+	Alias /fail /home/piupartsm/piuparts-master/fail
+	<Location /fail>
+	    Options +Indexes
+	    IndexOptions FancyIndexing NameWidth=* 
+	    IndexOrderDefault Descending Date
+	</Location>
+
+	Alias /bugged /home/piupartsm/piuparts-master/bugged
+	<Location /bugged>
+	    Options +Indexes
+	    IndexOptions FancyIndexing NameWidth=* 
+	    IndexOrderDefault Descending Date
+	</Location>
+
+	Alias /untestable /home/piupartsm/piuparts-master/untestable
+	<Location /untestable>
+	    Options +Indexes
+	    IndexOptions FancyIndexing NameWidth=* 
+	    IndexOrderDefault Descending Date
+	</Location>
+
+	Alias /fixed /home/piupartsm/piuparts-master/fixed
+	<Location /fixed>
+	    Options +Indexes
+	    IndexOptions FancyIndexing NameWidth=* 
+	    IndexOrderDefault Descending Date
+	</Location>
+
+	Alias /pass /home/piupartsm/piuparts-master/pass
+	<Location /pass>
+	    Options +Indexes
+	    IndexOptions FancyIndexing NameWidth=* 
+	    IndexOrderDefault Descending Date
+	</Location>
+
 </VirtualHost>

Modified: fai-config-dir/files/etc/apt/preferences/piatti
===================================================================
--- fai-config-dir/files/etc/apt/preferences/piatti	2007-12-22 17:01:29 UTC (rev 117)
+++ fai-config-dir/files/etc/apt/preferences/piatti	2007-12-22 17:54:38 UTC (rev 118)
@@ -1,3 +1,11 @@
+Package: *
+Pin: release a=stable
+Pin-Priority: 500
+
+Package: *
+Pin: release a=unstable
+Pin-Priority: 50
+
 Package: xen-tools
 Pin: release a=etch-backports
 Pin-Priority: 999
@@ -5,3 +13,11 @@
 Package: xen-shell
 Pin: release a=etch-backports
 Pin-Priority: 999
+
+Package: piuparts
+Pin: release a=unstable
+Pin-Priority: 999
+
+Package: debian-archive-keyring
+Pin: release a=unstable
+Pin-Priority: 999

Modified: fai-config-dir/files/etc/apt/sources.list/piatti
===================================================================
--- fai-config-dir/files/etc/apt/sources.list/piatti	2007-12-22 17:01:29 UTC (rev 117)
+++ fai-config-dir/files/etc/apt/sources.list/piatti	2007-12-22 17:54:38 UTC (rev 118)
@@ -20,3 +20,7 @@
 # bpo
 deb http://www.backports.org/debian etch-backports main 
 deb-src http://www.backports.org/debian etch-backports main 
+
+# sid (for piuparts)
+deb http://ftp.fi.debian.org/debian/ sid main
+deb-src http://ftp.fi.debian.org/debian/ sid main

Added: fai-config-dir/files/etc/piuparts/piuparts-master.conf/PIUPARTS
===================================================================
--- fai-config-dir/files/etc/piuparts/piuparts-master.conf/PIUPARTS	                        (rev 0)
+++ fai-config-dir/files/etc/piuparts/piuparts-master.conf/PIUPARTS	2007-12-22 17:54:38 UTC (rev 118)
@@ -0,0 +1,26 @@
+#
+# This is the configuration file for piuparts-master, the master portion
+# of the distributed piuparts system.
+#
+# You MUST make sure that the packages url is set correctly. The sample
+# file does not set it at all, to prevent the master from being run
+# accidentally.
+# 
+# Lars Wirzenius <liw at iki.fi>
+#
+
+[master]
+log-file = /dev/null
+packages-url = http://localhost/debian/dists/sid/main/binary-i386/Packages.bz2
+
+# You can have other sections, in order to support one master for multiple
+# dists and/or architectures.  In the slave configuration file, be sure to
+# append the appropriate section name to the master-command option.
+
+## [sid-ia64]
+## log-file = /dev/null
+## packages-url = http://ftp.debian.org/debian/dists/sid/binary-ia64/Packages.bz2
+
+## [s-p-u-i386]
+## log-file = /dev/null
+## packages-url = http://ftp.debian.org/debian/dists/stable-proposed-updates/binary-i386/Packages.bz2

Added: fai-config-dir/files/etc/piuparts/piuparts-report.conf/PIUPARTS
===================================================================
--- fai-config-dir/files/etc/piuparts/piuparts-report.conf/PIUPARTS	                        (rev 0)
+++ fai-config-dir/files/etc/piuparts/piuparts-report.conf/PIUPARTS	2007-12-22 17:54:38 UTC (rev 118)
@@ -0,0 +1,11 @@
+#
+# This is the configuration file for piuparts-report, the HTML report
+# creation portion of the distributed piuparts system.
+#
+# Lars Wirzenius <liw at iki.fi>
+#
+
+[report]
+output-dir = html
+index-page = index.html
+packages-url = http://localhost/debian/dists/sid/main/binary-i386/Packages.bz2

Added: fai-config-dir/files/etc/piuparts/piuparts-slave.conf/PIUPARTS
===================================================================
--- fai-config-dir/files/etc/piuparts/piuparts-slave.conf/PIUPARTS	                        (rev 0)
+++ fai-config-dir/files/etc/piuparts/piuparts-slave.conf/PIUPARTS	2007-12-22 17:54:38 UTC (rev 118)
@@ -0,0 +1,46 @@
+#
+# This is the configuration file for piuparts-slave, the slave portion
+# of the distributed piuparts system.
+#
+# The sample file does not set all required values, to prevent the
+# master from being run accidentally.
+# 
+# Lars Wirzenius <liw at iki.fi>
+#
+
+[slave]
+idle-sleep = 300
+master-host = localhost
+master-user = piupartsm
+master-directory = piuparts-master
+master-command = python /usr/share/piuparts/piuparts-master.py
+mirror = http://localhost/debian
+piuparts-cmd = sudo piuparts
+distro = sid
+chroot-tgz = sid.tar.gz
+upgrade-test-distros = etch lenny sid
+upgrade-test-chroot-tgz = etch.tar.gz
+max-reserved = 50
+debug = no
+
+# As in piuparts-master.conf, you can have multiple sections, so that you can
+# run piuparts-slave.py for multiple dists
+
+# For stable-proposed-updates, you'll have to roll your own chroot, or modify
+# the sources.list in a generated chroot for stable, in order to include the
+# appropriate deb line for stable-proposed-updates
+## [s-p-u-i386]
+## idle-sleep = 300
+## # master-host = localhost
+## # master-user = piuparts
+## # master-directory = .
+## master-command = python /usr/share/piuparts/piuparts-master.py s-p-u-i386
+## # mirror = http://your.mirror.here/debian
+## piuparts-cmd = sudo piuparts
+## distro = stable-proposed-updates
+## chroot-tgz = s-p-u.tar.gz
+## keep-sources-list = yes
+## upgrade-test-distros =
+## upgrade-test-chroot-tgz =
+## max-reserved = 50
+## debug = no

Modified: fai-config-dir/files/var/www/index.html/piatti
===================================================================
--- fai-config-dir/files/var/www/index.html/piatti	2007-12-22 17:01:29 UTC (rev 117)
+++ fai-config-dir/files/var/www/index.html/piatti	2007-12-22 17:54:38 UTC (rev 118)
@@ -22,7 +22,7 @@
 hosted at piuparts.cs.helsinki.fi by the University of Helsinki,
 CS department.</p>
 
-<p>More information about the setup is available at <a href="wiki.debian.org/piuparts">wiki.debian.org/piuparts</a>.</p>
+<p>More information about the setup is available at <a href="http://wiki.debian.org/piuparts">wiki.debian.org/piuparts</a>.</p>
 
 <p>This machine runs piuparts. You can look at log files:</p>
 

Modified: fai-config-dir/scripts/DEFAULT/90-apt
===================================================================
--- fai-config-dir/scripts/DEFAULT/90-apt	2007-12-22 17:01:29 UTC (rev 117)
+++ fai-config-dir/scripts/DEFAULT/90-apt	2007-12-22 17:54:38 UTC (rev 118)
@@ -7,5 +7,7 @@
 
 # pdiffs, no thanks
 echo 'Acquire::PDiffs "false";' > $target/etc/apt/apt.conf.d/99pdiff
+# need more cache
+echo 'APT::Cache-Limit "141943904";' > $target/etc/apt/apt.conf.d/30cache
 
 fcopy -r -M /etc/apt/

Added: fai-config-dir/scripts/PIUPARTS/10-configure
===================================================================
--- fai-config-dir/scripts/PIUPARTS/10-configure	                        (rev 0)
+++ fai-config-dir/scripts/PIUPARTS/10-configure	2007-12-22 17:54:38 UTC (rev 118)
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+#
+#        (c) 2007 Holger Levsen         holger at layer-acht.org
+#        GPL2 licenced
+#
+
+fcopy -r -M /var/www


Property changes on: fai-config-dir/scripts/PIUPARTS/10-configure
___________________________________________________________________
Name: svn:executable
   + *




More information about the Piuparts-commits mailing list