From e5ea3b52c098a2bc284e3cb22a0e0527a8764386 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 21 Dec 2015 20:09:10 +0100 Subject: [PATCH] Add mirror-isc to syncproxy role, update rsync.conf --- hieradata/common.yaml | 1 + modules/roles/files/syncproxy/rsyncd.conf | 8 ++++---- modules/roles/manifests/syncproxy.pp | 2 ++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 4038a5bfa..9c413f6ba 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -137,6 +137,7 @@ roles: - wolkenstein.debian.org syncproxy: - milanollo.debian.org + - mirror-isc.debian.org tracker: - ticharich.debian.org udd: diff --git a/modules/roles/files/syncproxy/rsyncd.conf b/modules/roles/files/syncproxy/rsyncd.conf index eb1e47692..387a4e1ee 100644 --- a/modules/roles/files/syncproxy/rsyncd.conf +++ b/modules/roles/files/syncproxy/rsyncd.conf @@ -10,7 +10,7 @@ log file = /var/log/rsyncd/rsyncd.log [debian] path = /srv/mirrors/debian/ - comment = Full Debian FTP Archive (~800 GB; contact mirrors@debian.org for access) + comment = Full Debian FTP Archive (~1.5 TB as of 2015; contact mirrors@debian.org for access) auth users = * read only = true secrets file = /etc/rsyncd/debian.secrets @@ -24,15 +24,15 @@ log file = /var/log/rsyncd/rsyncd.log [debian-debug] path = /srv/mirrors/debian-debug/ - comment = Debug packages. Probably large. Starting mid 2015. + comment = Debug packages. Probably large. Starting end of 2015. auth users = * read only = true - secrets file = /etc/rsyncd/ftp.secrets + secrets file = /etc/rsyncd/debian.secrets list = no [debian-security] path = /srv/mirrors/debian-security/ - comment = Debian security archive (~40 GB; contact mirrors@debian.org for access) + comment = Debian security archive (~100 GB; contact mirrors@debian.org for access) auth users = * read only = true secrets file = /etc/rsyncd/debian.secrets diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp index 9a988d087..087c13a0b 100644 --- a/modules/roles/manifests/syncproxy.pp +++ b/modules/roles/manifests/syncproxy.pp @@ -3,10 +3,12 @@ class roles::syncproxy { source => 'puppet:///modules/roles/syncproxy/rsyncd.conf', bind => $::hostname ? { 'milanollo' => '5.153.231.9', + 'mirror-isc' => '149.20.20.21', default => '' }, bind6 => $::hostname ? { 'milanollo' => '2001:41c8:1000:21::21:9', + 'mirror-isc' => '2001:4f8:8:36::1deb:21', default => '' }, } -- 2.20.1