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 9a877cd..baa128d 100644 (file)
--- 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 a0f3ac1..9efae95 100644 (file)
--- 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':