From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 12 Sep 2017 09:50:17 +0000 (+0000)
Subject: Make historical mirror rsync template use the archive_root variable
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d07de0cb875efbf796c6a09cf0fb154865663d48;p=mirror%2Fdsa-puppet.git

Make historical mirror rsync template use the archive_root variable
---

diff --git a/modules/roles/templates/historical_mirror/rsyncd.conf.erb b/modules/roles/templates/historical_mirror/rsyncd.conf.erb
index 48438f1b3..8e64dcb09 100644
--- a/modules/roles/templates/historical_mirror/rsyncd.conf.erb
+++ b/modules/roles/templates/historical_mirror/rsyncd.conf.erb
@@ -7,12 +7,12 @@ timeout = 7200
 log file = /var/log/rsyncd/rsyncd-archive.log
 
 [debian-archive]
-  path = /srv/mirrors/debian-archive
+  path = <%= @archive_root %>
   comment = Debian Historical Archives (use -H to save space)
   read only = true
 
 [archive]
-  path = /srv/mirrors/debian-archive
+  path = <%= @archive_root %>
   comment = Debian Archive (use -H to save space)
   read only = true
   list = no