Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet

* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  use busoni instead of mirror-anu for tor static

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index bfa8a9c..75a759a 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -135,8 +135,8 @@ roles:
     - senfter.debian.org
     - santoro.debian.org
   static_mirror_onion:
+    - busoni.debian.org
     - klecker.debian.org
-    - mirror-anu.debian.org
     - mirror-isc.debian.org
     - senfter.debian.org
   # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c859629..0fd3ab8 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -32,9 +32,9 @@ class roles::static_mirror {
        }
 
        $onion_v4_addr = $::hostname ? {
+               busoni     => '140.211.15.34',
                klecker    => '130.89.148.14',
                mirror-isc => '149.20.20.22',
-               mirror-anu => '150.203.164.62',
                senfter    => '5.153.231.4',
                default    => undef,
        }