modules/buildd: move dupload.conf within puppet control (merge package

configuration plus the local configuration in ~buildd)

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
new file mode 100644 (file)
index 0000000..25467ad
--- /dev/null
+++ b/modules/buildd/files/dupload.conf
@@ -0,0 +1,71 @@
+package config;
+
+#$preupload{'changes'} = '/usr/share/dupload/gpg-check %1';
+
+$cfg{'anonymous-ftp-master'} = {
+        method => "ftp",
+        passive => 1,
+        fqdn => "ftp-master.debian.org",
+        incoming => "/pub/UploadQueue/",
+        # files pass on to dinstall on ftp-master which sends emails itself
+        dinstall_runs => 1,
+};
+
+# see http://www.debian.org/devel/debian-volatile/ for more information
+$cfg{'volatile'} = {
+        fqdn => "volatile-master.debian.org",
+        incoming => "/pub/UploadQueue/",
+        # files pass on to dinstall on ftp-master which sends emails itself
+        dinstall_runs => 1,
+        passive => 1,
+};
+
+# For Delayed uploads use this. You can use 0-day, which is uploaded
+# one hour before dinstall runs.
+$delay = (defined($ENV{DEBDELAY}) ? $ENV{DEBDELAY} : 7);
+$cfg{'delayed'} = {
+        fqdn => "ftp.upload.debian.org",
+        incoming => "/pub/UploadQueue/DELAYED/$delay-day/",
+        # The dinstall on ftp-master sends emails itself
+        dinstall_runs => 1,
+        passive => 1,
+};
+
+# Mentors upload queue, see
+# http://mentors.debian.net/cgi-bin/maintainer-intro
+$cfg{'mentors'} = {
+        fqdn    =>'mentors.debian.net',
+        incoming=>'/',
+        dinstall_runs => 1,
+        passive => 1,
+};
+
+
+$cfg{'anonymous-security'} = {
+        fqdn => "security-master.debian.org",
+        incoming => "/pub/SecurityUploadQueue",
+        # files pass on to dinstall on security which sends emails itself
+        dinstall_runs => 1,
+        passive => 1,
+};
+
+$cfg{'debian-edu'} = {
+        fqdn => "ftp.skolelinux.org",
+        incoming => "/pub/UploadQueue",
+        dinstall_runs => 1,
+        passive => 1,
+};
+
+$cfg{'bpo'} = {
+        fqdn => "backports-master.debian.org",
+        incoming => "/pub/UploadQueue",
+        dinstall_runs => 1,
+        passive => 1,
+};
+
+# Don't remove the following line.  Perl needs it.
+1;
+
+## Local Variables: ##
+## mode:perl ##
+## End: ##

diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index b5ec580..509d335 100644 (file)
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -5,6 +5,7 @@ class buildd {
         "buildd-builder-meta": ensure => installed;
         "apt-transport-https": ensure => installed;
         "debootstrap": ensure => installed;
+        "dupload": ensure => installed;
     }
    
     file {
@@ -27,6 +28,10 @@ class buildd {
              source => "puppet:///modules/buildd/cron.d-dsa-buildd",
              require => Package["cron"]
              ;
+        "/etc/dupload.conf":
+             source => "puppet:///modules/buildd/dupload.conf",
+             require => Package["dupload"]
+             ;
     }
 }
 # vim:set et: