From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 12 Sep 2017 09:49:15 +0000 (+0000)
Subject: historical mirror: make rsyncd.conf a template
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=185058d5903683884231bdb5b28f27e0814b49c4;p=mirror%2Fdsa-puppet.git

historical mirror: make rsyncd.conf a template
---

diff --git a/modules/roles/files/historical_mirror/rsyncd.conf b/modules/roles/files/historical_mirror/rsyncd.conf
deleted file mode 100644
index 48438f1b3..000000000
--- a/modules/roles/files/historical_mirror/rsyncd.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-uid = nobody
-gid = nogroup
-syslog facility = daemon
-socket options = SO_KEEPALIVE
-reverse lookup = false
-timeout = 7200
-log file = /var/log/rsyncd/rsyncd-archive.log
-
-[debian-archive]
-  path = /srv/mirrors/debian-archive
-  comment = Debian Historical Archives (use -H to save space)
-  read only = true
-
-[archive]
-  path = /srv/mirrors/debian-archive
-  comment = Debian Archive (use -H to save space)
-  read only = true
-  list = no
diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index b6fc7006c..eb3230a37 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -34,7 +34,7 @@ class roles::historical_mirror {
 	}
 
 	rsync::site { 'archive':
-		source      => 'puppet:///modules/roles/historical_mirror/rsyncd.conf',
+		content     => template('roles/historical_mirror/rsyncd.conf.erb'),
 		max_clients => 100,
 		sslname     => $sslname,
 		binds       => $binds,
diff --git a/modules/roles/templates/historical_mirror/rsyncd.conf.erb b/modules/roles/templates/historical_mirror/rsyncd.conf.erb
new file mode 100644
index 000000000..48438f1b3
--- /dev/null
+++ b/modules/roles/templates/historical_mirror/rsyncd.conf.erb
@@ -0,0 +1,18 @@
+uid = nobody
+gid = nogroup
+syslog facility = daemon
+socket options = SO_KEEPALIVE
+reverse lookup = false
+timeout = 7200
+log file = /var/log/rsyncd/rsyncd-archive.log
+
+[debian-archive]
+  path = /srv/mirrors/debian-archive
+  comment = Debian Historical Archives (use -H to save space)
+  read only = true
+
+[archive]
+  path = /srv/mirrors/debian-archive
+  comment = Debian Archive (use -H to save space)
+  read only = true
+  list = no