little /srv/mirrors changes

[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 0482362..a2d5aee 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,13 +1,15 @@
 class roles::security_mirror {
+       include roles::archvsync_base
+
        $rsync_bind = $::hostname ? {
                mirror-anu => '150.203.164.61',
-               mirror-isc => '149.20.20.19',
+               mirror-isc => '149.20.4.14',
                mirror-umn => '128.101.240.215',
                default    => '',
        }
        $rsync_bind6 = $::hostname ? {
                mirror-anu => '2001:388:1034:2900::3d',
-               mirror-isc => '2001:4f8:8:36::1deb:19',
+               mirror-isc => '2001:4f8:1:c::14',
                mirror-umn => '2607:ea00:101:3c0b::1deb:215',
                default    => '',
        }
@@ -20,7 +22,14 @@ class roles::security_mirror {
                default => undef,
        }
 
-       include apache2::cache
+       file { '/srv/mirrors/debian-security':
+               ensure => link,
+               target => '../ftp.root/debian-security',
+       }
+
+       include apache2::expires
+       include apache2::rewrite
+
        apache2::site { '010-security.debian.org':
                site   => 'security.debian.org',
                content => template('roles/security_mirror/security.debian.org.erb')
@@ -51,10 +60,9 @@ class roles::security_mirror {
                bind6       => $rsync_bind6,
        }
 
-
        $onion_v4_addr = $::hostname ? {
                mirror-anu => '150.203.164.61',
-               mirror-isc => '149.20.20.19',
+               mirror-isc => '149.20.4.14',
                mirror-umn => '128.101.240.215',
                villa      => '212.211.132.32',
                lobos      => '212.211.132.250',