move bind addresses to vars

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

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 131fdc6..d8621bd 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,10 +1,23 @@
 class roles::syncproxy {
-       rsync::site { 'syncproxy':
-               source => 'puppet:///modules/roles/syncproxy/rsyncd.conf',
-               bind   => $::hostname ? {
-                       'milanollo' => 5.153.231.9,
+       $bind = $::hostname ? {
+                       'milanollo' => '5.153.231.9',
+                       'mirror-isc' => '149.20.20.21',
+                       'mirror-umn' => '128.101.240.216',
+                       'klecker' => '130.89.148.10',
+                       default => ''
+               }
+       bind6   = $::hostname ? {
+                       'milanollo' => '2001:41c8:1000:21::21:9',
+                       'mirror-isc' => '2001:4f8:8:36::1deb:21',
+                       'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
+                       'klecker' => '2001:610:1908:b000::148:10',
                        default => ''
                }
+
+       rsync::site { 'syncproxy':
+               content => template('roles/syncproxy/rsyncd.conf.erb'),
+               bind    => $bind,
+               bind6   => $bind6,
        }
 
        file { '/etc/rsyncd':
@@ -14,6 +27,6 @@ class roles::syncproxy {
        file { '/etc/rsyncd/debian.secrets':
                owner => 'root',
                group => 'mirroradm',
-               mode => 0664,
+               mode => 0660,
        }
 }