X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Ffiles%2Fdupload.conf;h=37f1ef84533eb276eb6e6e7435c980f61acbcce7;hb=95eb00d9ac5f57b6d688a8ab7d65fd1fceb380a1;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..37f1ef845 100644
--- a/modules/buildd/files/dupload.conf
+++ b/modules/buildd/files/dupload.conf
@@ -1,6 +1,10 @@
+##
+## 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';
+$preupload{'changes'} = '/usr/share/dupload/gpg-check %1';
 
 $cfg{'anonymous-ftp-master'} = {
         method => "ftp",
@@ -10,14 +14,16 @@ $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'};
 
-# see http://www.debian.org/devel/debian-volatile/ for more information
-$cfg{'volatile'} = {
-        fqdn => "volatile-master.debian.org",
-        incoming => "/pub/UploadQueue/",
+# 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,
-        passive => 1,
 };
 
 # For Delayed uploads use this. You can use 0-day, which is uploaded
@@ -48,20 +54,7 @@ $cfg{'anonymous-security'} = {
         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,
-};
+$cfg{'security'} = $cfg{'anonymous-security'};
 
 # Don't remove the following line.  Perl needs it.
 1;