From: Bastian Blank <waldi@debian.org>
Date: Tue, 10 Jan 2017 20:01:30 +0000 (+0100)
Subject: Use archvsync managed secrets files for rsyncd on security-master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=26671bd9d192b030bf949c106cc880022ef13049;p=mirror%2Fdsa-puppet.git

Use archvsync managed secrets files for rsyncd on security-master
---

diff --git a/modules/roles/files/security_master/rsyncd.conf b/modules/roles/files/security_master/rsyncd.conf
index f1b4926a2..8cf2f8f7c 100644
--- a/modules/roles/files/security_master/rsyncd.conf
+++ b/modules/roles/files/security_master/rsyncd.conf
@@ -11,7 +11,8 @@ log file = /var/log/rsyncd/rsyncd.log
   comment = Debian security archive
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/exports.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security.secrets
+  strict modes = false
   list = no
 
 [debian-security-buildd-dists]
@@ -20,7 +21,8 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-dists.secrets
+  strict modes = false
 
 [debian-security-buildd-pool]
   path = /srv/security-master.debian.org/buildd/debian-security-buildd/pool
@@ -28,4 +30,5 @@ log file = /var/log/rsyncd/rsyncd.log
   read only = true
   list = no
   auth users = *
-  secrets file = /etc/rsyncd/buildd-pool.secrets
+  secrets file = /home/archvsync/rsyncd/debian-security-buildd-pool.secrets
+  strict modes = false