[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.44-615-gd8f90f9

[David Steele]

The following commit has been merged in the develop branch:
commit f18f8643beb1f214b009bbc249f8babf8aa7edf3
Author: David Steele <dsteele at gmail.com>
Date:   Thu May 17 19:28:53 2012 -0400

    Establish source 'conf' directory, with configuration files needed for server.

diff --git a/conf/piuparts.apache b/conf/piuparts.apache
new file mode 100644
index 0000000..8128274
--- /dev/null
+++ b/conf/piuparts.apache
@@ -0,0 +1,11 @@
+Alias /piuparts /var/lib/piuparts/htdocs
+
+<Directory /var/lib/piuparts/htdocs>
+  Order allow,deny
+  Allow from all
+
+  Options indexes
+</Directory>
+
+
+
diff --git a/piuparts.conf.sample b/conf/piuparts.conf.sample
similarity index 69%
rename from piuparts.conf.sample
rename to conf/piuparts.conf.sample
index c838989..5ff6013 100644
--- a/piuparts.conf.sample
+++ b/conf/piuparts.conf.sample
@@ -12,20 +12,26 @@
 
 [global]
 sections = sid
-# master-host = localhost
-# master-user = piuparts
-# master-directory = .
-output-directory = html
+master-host = localhost
+master-user = piupartsm
+master-directory = /var/lib/piuparts/master
+output-directory = /var/lib/piuparts/htdocs
 idle-sleep = 300
+max-tgz-age = 604800
+reschedule-old-days = 90
+reschedule-old-count = 150
+reschedule-fail-days = 30
+reschedule-fail-count = 25
+#bts-from
 
 [sid]
+precedence = 1
 description = "Debian sid / main"
 master-command = python /usr/share/piuparts/piuparts-master sid
 # mirror = http://your.mirror.here/debian
 # packages-url = http://your.mirror.here/debian/dists/sid/main/binary-i386/Packages.bz2
-piuparts-cmd = sudo piuparts
-# another example:
-# piuparts-cmd = sudo piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /var/tmp
+# sources-url = http://your.mirror.here/debian/dists/sid/main/source/Sources.bz2
+piuparts-cmd = sudo piuparts --no-symlinks --scriptsdir /etc/piuparts/scripts/ --tmpdir /var/tmp
 distro = sid
 chroot-tgz = sid.tar.gz
 upgrade-test-distros = 
@@ -34,6 +40,7 @@ max-reserved = 50
 debug = no
 log-file = sid-master.log
 
+
 ## another example:
 ## [s-p-u-i386]
 ## master-command = python /usr/share/piuparts/piuparts-master.py s-p-u-i386
diff --git a/conf/piuparts.sudoers b/conf/piuparts.sudoers
new file mode 100644
index 0000000..69ffeec
--- /dev/null
+++ b/conf/piuparts.sudoers
@@ -0,0 +1,7 @@
+# The piuparts slave needs to handle chroots
+piupartss       ALL=(ALL) NOPASSWD: ALL
+
+#piuparts admins
+%piuparts       ALL=(piupartss) ALL
+%piuparts       ALL=(piupartsm) ALL
+
diff --git a/debian/changelog b/debian/changelog
index 29d2342..8a224fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ piuparts (0.45) UNRELEASED; urgency=low
   [ David Steele ]
   * Remove debian/postinst as it was only dealing with lenny time area
     configuration files.
+  * Added server configuration files for apache, sudo, and cron.
   * packagesdb.py:
     - Calculate recursive reverse dependency count, and store in PackagesDB.
     - Calculate the count of packages being blocked by a failed package.

-- 
piuparts git repository