ftp-master as historical_master (part of RT#7644)

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index 62c0139..687f043 100644 (file)
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -41,3 +41,9 @@ strict modes = false
   path = /srv/ftp-master.debian.org/public/incoming.debian.org/web/debian-buildd
   auth users = *
   secrets file = /home/archvsync/rsyncd/debian-buildd.secrets
   path = /srv/ftp-master.debian.org/public/incoming.debian.org/web/debian-buildd
   auth users = *
   secrets file = /home/archvsync/rsyncd/debian-buildd.secrets

+
+[debian-archive]
+  comment = Debian Historical Archives (use -H to save space)
+  path = /srv/archive.debian.org/debian-archive
+  auth users = *
+  secrets file = /home/archvsync/rsyncd/debian-archive.secrets

diff --git a/modules/roles/manifests/ftp_master.pp b/modules/roles/manifests/ftp_master.pp
index 40f8040..37219b6 100644 (file)
--- a/modules/roles/manifests/ftp_master.pp
+++ b/modules/roles/manifests/ftp_master.pp
@@ -7,6 +7,7 @@ class roles::ftp_master (
 {
   include roles::dakmaster
   include roles::signing
 {
   include roles::dakmaster
   include roles::signing

+  include roles::historical_master

   include apache2
 
   rsync::site { 'dakmaster':
   include apache2
 
   rsync::site { 'dakmaster':