Clean up mentions of ball.d.o

Suggested-by: Martin Zobel-Helas <zobel@debian.org>
Suggested-in: <20150629212028.GA30893@ftbfs.de>

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 7e91207fde93b2e10ec3665b0400566efcb39708..c97f774498988811b96e442275d13895c2d14a00 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -162,7 +162,7 @@ class debian-org {
                components => ['main','contrib','non-free']
        }
 
-       #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+       #if ($::hostname in [corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
        #   ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
        #       site::aptrepo { 'proposed-updates':
        #               url        => $mirror,

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 3cb506c5acdb58505382c8bcb518194629115b33..86efa33f6e44cb7d8ec81c031ab07453671c00e2 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -217,7 +217,6 @@ host_settings:
     - arm-linaro-03.debian.org
     - arnold.debian.org
     - babin.debian.org
-    - ball.debian.org
     - brahms.debian.org
     - caballero.debian.org
     - corelli.debian.org
@@ -265,7 +264,6 @@ host_settings:
     - arm-arm-02.debian.org
     - arm-arm-03.debian.org
     - arnold.debian.org
-    - ball.debian.org
     - corelli.debian.org
     - gabrielli.debian.org
     - harris.debian.org

diff --git a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
index 30fcc7dede7904f287ff24b72d86ee3e5e0b84d4..a88d18147aa49e188a5b613dbbf547b3fcc2cc73 100644 (file)
--- a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
+++ b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
@@ -6,11 +6,7 @@
 SHELL=/bin/bash
 @hourly  root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
 <% if @lsbmajdistrelease <= '7' -%>
-<% if scope.lookupvar('::hostname') == 'ball' -%>
-34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 7200 )); if [ -x /usr/bin/timeout ]; then TO="timeout --kill-after=900 3600"; else TO=""; fi; tmp="$(tempfile)"; egrep -v '^(#|$)' /etc/dsa/cron.ignore.dsa-puppet-stuff > "$tmp" && $TO /usr/bin/ruby1.9.1 /usr/sbin/puppetd -o --no-daemonize 2>&1 | egrep --text -v -f "$tmp"; rm -f "$tmp"; fi
-<% else -%>
 34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 7200 )); if [ -x /usr/bin/timeout ]; then TO="timeout --kill-after=900 3600"; else TO=""; fi; tmp="$(tempfile)"; egrep -v '^(#|$)' /etc/dsa/cron.ignore.dsa-puppet-stuff > "$tmp" && $TO /usr/sbin/puppetd -o --no-daemonize 2>&1 | egrep --text -v -f "$tmp"; rm -f "$tmp"; fi
-<% end -%>
 <% else -%>
 34 */4 * * * root if [ -x /usr/bin/puppet ]; then sleep $(( $RANDOM \% 7200 )); if [ -x /usr/bin/timeout ]; then TO="timeout --kill-after=900 3600"; else TO=""; fi; tmp="$(tempfile)"; egrep -v '^(#|$)' /etc/dsa/cron.ignore.dsa-puppet-stuff > "$tmp" && $TO /usr/bin/puppet agent --onetime --no-daemonize 2>&1 | egrep --text -v -f "$tmp"; rm -f "$tmp"; fi
 <% end -%>