Add volumes for diabelli, menotti, nono and reger on ganeti2.ubc.d.o

[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 8ecc15b..986b5ae 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,12 +1,12 @@
 class roles::security_mirror {
        $rsync_bind = $::hostname ? {
-               mirror-anu => '150.203.164.39', # XXX this will change to 61
+               mirror-anu => '150.203.164.61',
                mirror-isc => '149.20.20.19',
                mirror-umn => '128.101.240.215',
                default    => '',
        }
        $rsync_bind6 = $::hostname ? {
-               mirror-anu => '2001:388:1034:2900::3d', # XXX this will change to 3d
+               mirror-anu => '2001:388:1034:2900::3d',
                mirror-isc => '2001:4f8:8:36::1deb:19',
                mirror-umn => '2607:ea00:101:3c0b::1deb:215',
                default    => '',
@@ -32,4 +32,25 @@ class roles::security_mirror {
                bind        => $rsync_bind,
                bind6       => $rsync_bind6,
        }
+
+
+       $onion_v4_addr = $::hostname ? {
+               mirror-anu => '150.203.164.61',
+               mirror-isc => '149.20.20.19',
+               mirror-umn => '128.101.240.215',
+               villa      => '212.211.132.32',
+               lobos      => '212.211.132.250',
+               default   => undef,
+       }
+       if has_role('security_mirror_onion') {
+               if ! $onion_v4_addr {
+                       fail("Do not have an onion_v4_addr set for $::hostname.")
+               }
+
+               onion::service { 'security.debian.org':
+                       port => 80,
+                       target_port => 80,
+                       target_address => $onion_v4_addr,
+               }
+       }
 }