From: Bastian Blank <bastian@waldi.eu.org>
Date: Tue, 10 Jan 2017 18:43:36 +0000 (+0100)
Subject: Use archvsync managed secrets files for rsyncd on ports-master
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=70e9c36fbacc4d33e03d615727beab55368fe2ab;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/roles/files/ports-master/rsyncd.conf b/modules/roles/files/ports-master/rsyncd.conf
index 9a877cd04..baa128d16 100644
--- a/modules/roles/files/ports-master/rsyncd.conf
+++ b/modules/roles/files/ports-master/rsyncd.conf
@@ -12,11 +12,13 @@ log file = /var/log/rsyncd/rsyncd-ports-master.log
   auth users = *
   read only = true
   ignore nonreadable = true
-  secrets file = /etc/rsyncd/debian.secrets
+  secrets file = /home/archvsync/rsyncd/debian-ports.secrets
+  strict modes = false
 
 [debian-ports-cd]
   path = /srv/ports-master.debian.org/ftp/debian-ports-cd
   comment = debian-ports-cd tree - see https://www.ports.debian.org/
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/debian.secrets
+  secrets file = /home/archvsync/rsyncd/debian-ports-cd.secrets
+  strict modes = false
diff --git a/modules/roles/manifests/ports-master.pp b/modules/roles/manifests/ports-master.pp
index a0f3ac1b4..9efae9547 100644
--- a/modules/roles/manifests/ports-master.pp
+++ b/modules/roles/manifests/ports-master.pp
@@ -9,16 +9,6 @@ class roles::ports-master {
 		key => true,
 	}
 
-	file { '/etc/rsyncd':
-		ensure => 'directory'
-	}
-
-	file { '/etc/rsyncd/debian.secrets':
-		owner => 'root',
-		group => 'mirroradm',
-		mode => 0660,
-	}
-
 	include ferm::ftp_conntrack
 
 	vsftpd::site { 'ports-master':