Make syncproxy mirror basedir configurable in hiera, and use it in all templates...

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

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 0c1d993..3b4816d 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,9 +1,12 @@
 class roles::syncproxy {
        include roles::archvsync_base
 
+       $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-conova' => [ '217.196.149.237', '[2a02:16a8:dc41:100::237]' ],
                '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]',
@@ -14,6 +17,7 @@ class roles::syncproxy {
        $syncproxy_name = $::hostname ? {
                'milanollo' => 'syncproxy3.eu.debian.org',
                'mirror-anu' => 'syncproxy.au.debian.org',
+               'mirror-conova' => 'syncproxy4.eu.debian.org',
                'mirror-isc' => 'syncproxy2.wna.debian.org',
                'mirror-umn' => 'syncproxy.cna.debian.org',
                'klecker' => 'syncproxy2.eu.debian.org',