Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

diff --git a/modules/buildd/files/dupload.conf b/modules/buildd/files/dupload.conf
index d263ebb05bc6df41ae0ceaccbb11ab1082cbe8e8..c477ca45216042bb83972b7f76718eb0474b8aea 100644 (file)
--- a/modules/buildd/files/dupload.conf
+++ b/modules/buildd/files/dupload.conf
@@ -14,6 +14,7 @@ $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'} = {
@@ -52,6 +53,7 @@ $cfg{'anonymous-security'} = {
         dinstall_runs => 1,
         passive => 1,
 };
+$cfg{'security'} = $cfg{'anonymous-security'};
 
 $cfg{'debian-edu'} = {
         fqdn => "ftp.skolelinux.org",
@@ -66,6 +68,7 @@ $cfg{'bpo'} = {
         dinstall_runs => 1,
         passive => 1,
 };
+$cfg{'backports'} = $cfg{'bpo'};
 
 # Don't remove the following line.  Perl needs it.
 1;