X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Ffiles%2Fdupload.conf;h=be4dd30c79b13cccc32a67c712b38fb63d873cb5;hb=7f8d799eb1e8d9899d37cc81ca40d04b275f2934;hp=25467ad59c260e6aed9b05ec4083eac7fe52b3e4;hpb=b6577bf29c47fd9dff8f40aceb200a3f4431dc1a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
index 25467ad59..be4dd30c7 100644
--- 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;