From: Julien Cristau <jcristau@debian.org>
Date: Wed, 16 Oct 2019 14:46:25 +0000 (+0200)
Subject: ftp-master as historical_master (part of RT#7644)
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7faa529dc53ec3a141d018231c27a9a36707c727;p=mirror%2Fdsa-puppet.git

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 62c0139df..687f04328 100644
--- 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
+
+[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 40f804096..37219b68c 100644
--- 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::historical_master
   include apache2
 
   rsync::site { 'dakmaster':