Use rsyncd via systemd on syncproxy

We also only need a list of bind addresses, so merge them.

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index a08b5a7..bc0e275 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,23 +1,14 @@
 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',
-               'gretchaninov' => '209.87.16.40',
-               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',
-               'gretchaninov' => '2607:f8f0:614:1::1274:40',
-               default => ''
+       $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:610:1908:b000::148:10]' ],
+               'gretchaninov' => [ '209.87.16.40', '[2607:f8f0:614:1::1274:40]' ],
+               default        => [ '[::]' ],
        }
        $syncproxy_name = $::hostname ? {
                'milanollo' => 'syncproxy3.eu.debian.org',
@@ -58,17 +49,15 @@ class roles::syncproxy {
                        content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
                }
 
-               rsync::site { 'syncproxy':
+               rsync::site_systemd { 'syncproxy':
                        content => template('roles/syncproxy/rsyncd.conf.erb'),
-                       bind    => $bind,
-                       bind6   => $bind6,
+                       binds   => $binds,
                        sslname => "$syncproxy_name",
                }
        } else {
-               rsync::site { 'syncproxy':
+               rsync::site_systemd { 'syncproxy':
                        content => template('roles/syncproxy/rsyncd.conf.erb'),
-                       bind    => $bind,
-                       bind6   => $bind6,
+                       binds   => $binds,
                }
        }
 }