Merge remote-tracking branch 'waldi/rsyncd-systemd'

[mirror/dsa-puppet.git] / modules / roles / files / dakmaster / rsyncd.conf

diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf
index ffc128c..47b9c8a 100644 (file)
--- a/modules/roles/files/dakmaster/rsyncd.conf
+++ b/modules/roles/files/dakmaster/rsyncd.conf
@@ -7,58 +7,29 @@ timeout = 7200
 log file = /var/log/rsyncd/rsyncd.log
 
 [indices]
-  path = /srv/ftp.debian.org/mirror/indices
+  path = /srv/ftp-master.debian.org/mirror/ftp-master/indices
   comment = index files
   auth users = *
   read only = true
   secrets file = /etc/rsyncd/indices.secrets
 
-[ftp]
-  path = /srv/ftp.debian.org/rsync/all
-  comment = Full Debian FTP Archive (~450 GB)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
-  list = no
-
-[debian-all]
-  path = /srv/ftp.debian.org/rsync/all
-  comment = Full Debian FTP Archive (~450 GB)
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
-  list = no
-
 [debian]
-  path = /srv/ftp.debian.org/rsync/all
-  comment = Full Debian FTP Archive (~450 GB)
+  path = /srv/ftp-master.debian.org/mirror/ftp-master
+  comment = Full Debian FTP Archive (huge and growing)
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
-
-[debian-backports]
-  path = /srv/backports-master.debian.org/mirror
-  comment = Debian Squeeze Backports
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/backports.secrets
-  list = no
+  secrets file = /home/archvsync/rsyncd/debian.secrets
+  strict modes = false
 
 [debian-debug]
-  path = /srv/ftp-master.debian.org/archive/debian-debug
+  path = /srv/ftp-master.debian.org/mirror/debian-debug
   comment = Debug packages.  Probably large.  Starting mid 2015.
   auth users = *
   read only = true
-  secrets file = /etc/rsyncd/ftp.secrets
+  secrets file = /home/archvsync/rsyncd/debian-debug.secrets
+  strict modes = false
   list = no
 
-[exports]
-  path = /srv/ftp.debian.org/rsync/export
-  comment = Various metadata exports
-  auth users = *
-  read only = true
-  secrets file = /etc/rsyncd/exports.secrets
-
 [buildd-keyrings]
   path = /srv/ftp-master.debian.org/scripts/builddkeyrings/keyrings
   comment = buildd keys for archive uploads
@@ -72,4 +43,5 @@ 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-buildd-dists.secrets
+  strict modes = false