Add syncproxy name for smit

[mirror/dsa-puppet.git] / modules / roles / manifests / syncproxy.pp

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 87ece1a..9812efa 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,29 +1,28 @@
 class roles::syncproxy {
        include roles::archvsync_base
 
-       $bind = $::hostname ? {
-               'milanollo' => '5.153.231.9',
-               'mirror-anu' => '150.203.164.60',
-               'mirror-isc' => '149.20.4.16',
-               'mirror-umn' => '128.101.240.216',
-               'klecker' => '130.89.148.10',
-               default => ''
-       }
-       $bind6 = $::hostname ? {
-               'milanollo' => '2001:41c8:1000:21::21:9',
-               'mirror-anu' => '2001:388:1034:2900::3c',
-               'mirror-isc' => '2001:4f8:1:c::16',
-               'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
-               'klecker' => '2001:610:1908:b000::148:10',
-               default => ''
+       $mirror_basedir_prefix = hiera('role_config__syncproxy.mirror_basedir_prefix')
+
+       $binds = $::hostname ? {
+               'milanollo'    => [ '5.153.231.9', '[2001:41c8:1000:21::21:9]' ],
+               'mirror-anu'   => [ '150.203.164.60', '[2001:388:1034:2900::3c]' ],
+               'mirror-isc'   => [ '149.20.4.16', '[2001:4f8:1:c::16]' ],
+               'mirror-umn'   => [ '128.101.240.216', '[2607:ea00:101:3c0b::1deb:216]' ],
+               'klecker'      => [ '130.89.148.10', '[2001:67c:2564:a119::148:10]' ],
+               'gretchaninov' => [ '209.87.16.40', '[2607:f8f0:614:1::1274:40]' ],
+               'schmelzer'    => [ '217.196.149.237', '[2a02:16a8:dc41:100::237]' ],
+               'smit'         => [ '130.89.148.78', '[2001:67c:2564:a119::78]' ],
+               default        => [ '[::]' ],
        }
        $syncproxy_name = $::hostname ? {
                'milanollo' => 'syncproxy3.eu.debian.org',
                'mirror-anu' => 'syncproxy.au.debian.org',
+               'schmelzer' => 'syncproxy4.eu.debian.org',
                'mirror-isc' => 'syncproxy2.wna.debian.org',
                'mirror-umn' => 'syncproxy.cna.debian.org',
                'klecker' => 'syncproxy2.eu.debian.org',
-               'gretchaninov' => 'gretchaninov.debian.org',
+               'smit' => 'syncproxy2.eu.debian.org',
+               'gretchaninov' => 'syncproxy3.wna.debian.org',
                default => 'unknown'
        }
 
@@ -34,7 +33,7 @@ class roles::syncproxy {
        file { '/etc/rsyncd/debian.secrets':
                owner => 'root',
                group => 'mirroradm',
-               mode => 0660,
+               mode => '0660',
        }
 
        if $::apache2 and $syncproxy_name != 'unknown' {
@@ -58,15 +57,13 @@ class roles::syncproxy {
 
                rsync::site { 'syncproxy':
                        content => template('roles/syncproxy/rsyncd.conf.erb'),
-                       bind    => $bind,
-                       bind6   => $bind6,
+                       binds   => $binds,
                        sslname => "$syncproxy_name",
                }
        } else {
                rsync::site { 'syncproxy':
                        content => template('roles/syncproxy/rsyncd.conf.erb'),
-                       bind    => $bind,
-                       bind6   => $bind6,
+                       binds   => $binds,
                }
        }
 }