fix whitespace

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

diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 7e3423a..202cabd 100644 (file)
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -1,6 +1,7 @@
 class roles::syncproxy {
        $bind = $::hostname ? {
                'milanollo' => '5.153.231.9',
+               'mirror-anu' => '150.203.164.60',
                'mirror-isc' => '149.20.20.21',
                'mirror-umn' => '128.101.240.216',
                'klecker' => '130.89.148.10',
@@ -8,6 +9,7 @@ class roles::syncproxy {
        }
        $bind6 = $::hostname ? {
                'milanollo' => '2001:41c8:1000:21::21:9',
+               'mirror-anu' => '2001:388:1034:2900::3c',
                'mirror-isc' => '2001:4f8:8:36::1deb:21',
                'mirror-umn' => '2607:ea00:101:3c0b::1deb:216',
                'klecker' => '2001:610:1908:b000::148:10',
@@ -15,18 +17,13 @@ class roles::syncproxy {
        }
        $syncproxy_name = $::hostname ? {
                'milanollo' => 'syncproxy3.eu.debian.org',
+               'mirror-anu' => 'syncproxy.au.debian.org',
                'mirror-isc' => 'syncproxy2.wna.debian.org',
                'mirror-umn' => 'syncproxy.cna.debian.org',
                'klecker' => 'syncproxy2.eu.debian.org',
                default => 'unknown'
        }
 
-       rsync::site { 'syncproxy':
-               content => template('roles/syncproxy/rsyncd.conf.erb'),
-               bind    => $bind,
-               bind6   => $bind6,
-       }
-
        file { '/etc/rsyncd':
                ensure => 'directory'
        }
@@ -38,8 +35,13 @@ class roles::syncproxy {
        }
 
        if $::apache2 and $syncproxy_name != 'unknown' {
+               include apache2::ssl
+               ssl::service { "$syncproxy_name":
+                       notify => Service['apache2'],
+                       key => true,
+               }
                apache2::site { '010-syncproxy.debian.org':
-                       site   => 'security.debian.org',
+                       site   => 'syncproxy.debian.org',
                        content => template('roles/syncproxy/syncproxy.debian.org-apache.erb')
                }
 
@@ -50,5 +52,18 @@ class roles::syncproxy {
                file { '/srv/www/syncproxy.debian.org/htdocs/index.html':
                        content => template('roles/syncproxy/syncproxy.debian.org-index.html.erb')
                }
+
+               rsync::site { 'syncproxy':
+                       content => template('roles/syncproxy/rsyncd.conf.erb'),
+                       bind    => $bind,
+                       bind6   => $bind6,
+                       sslname => "$syncproxy_name",
+               }
+       } else {
+               rsync::site { 'syncproxy':
+                       content => template('roles/syncproxy/rsyncd.conf.erb'),
+                       bind    => $bind,
+                       bind6   => $bind6,
+               }
        }
 }