buildd.conf: push more default values through puppet

[mirror/dsa-puppet.git] / modules / buildd / files / dupload.conf

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
index 25467ad..be4dd30 100644 (file)
--- a/modules/buildd/files/dupload.conf
+++ b/modules/buildd/files/dupload.conf
@@ -1,3 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
 package config;
 
 #$preupload{'changes'} = '/usr/share/dupload/gpg-check %1';
@@ -10,6 +14,17 @@ $cfg{'anonymous-ftp-master'} = {
         # files pass on to dinstall on ftp-master which sends emails itself
         dinstall_runs => 1,
 };
+$cfg{'ftp-master'} = $cfg{'anonymous-ftp-master'};
+
+# rsync upload to ssh.upload.debian.org
+$cfg{'rsync-ftp-master'} = {
+        method => "rsync",
+        login => "buildd-uploader",
+        fqdn => "ssh.upload.debian.org",
+        incoming => "/srv/upload.debian.org/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'} = {
@@ -48,6 +63,7 @@ $cfg{'anonymous-security'} = {
         dinstall_runs => 1,
         passive => 1,
 };
+$cfg{'security'} = $cfg{'anonymous-security'};
 
 $cfg{'debian-edu'} = {
         fqdn => "ftp.skolelinux.org",
@@ -62,6 +78,7 @@ $cfg{'bpo'} = {
         dinstall_runs => 1,
         passive => 1,
 };
+$cfg{'backports'} = $cfg{'bpo'};
 
 # Don't remove the following line.  Perl needs it.
 1;