rename bilbao to mirror-bytemark

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

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index a2d5aee..924ec12 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -3,29 +3,29 @@ class roles::security_mirror {
 
        $rsync_bind = $::hostname ? {
                mirror-anu => '150.203.164.61',
+               mirror-conova => '217.196.149.233',
                mirror-isc => '149.20.4.14',
                mirror-umn => '128.101.240.215',
                default    => '',
        }
        $rsync_bind6 = $::hostname ? {
                mirror-anu => '2001:388:1034:2900::3d',
+               mirror-conova => '2a02:16a8:dc41:100::233',
                mirror-isc => '2001:4f8:1:c::14',
                mirror-umn => '2607:ea00:101:3c0b::1deb:215',
                default    => '',
        }
-       $ftp_bind = $::hostname ? {
-               mirror-anu => '150.203.164.61',
-               default => '',
-       }
-       $ftp_bind6 = $::hostname ? {
-               mirror-anu => '2001:388:1034:2900::3d',
-               default => undef,
-       }
+       $ftp_bind = $rsync_bind
+       $ftp_bind6 = $rsync_bind6
 
        file { '/srv/mirrors/debian-security':
                ensure => link,
                target => '../ftp.root/debian-security',
        }
+       file { '/srv/ftp.root/.nobackup':
+               ensure  => present,
+               content => '',
+       }
 
        include apache2::expires
        include apache2::rewrite