retire ravel

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index eb2f6ec..eceb279 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -109,7 +109,6 @@ roles:
     - franck.debian.org
     - lindsay.debian.org
     - philp.debian.org
-    - ravel.debian.org
     - wolkenstein.debian.org
   syncproxy:
     - milanollo.debian.org
@@ -120,7 +119,7 @@ roles:
   vote:
     - vento.debian.org
   #weblog_destination:
-  #  - ravel.debian.org
+  #  - rXXXX.debian.org
   #weblog_provider:
   #  - busoni.debian.org
   #  - klecker.debian.org

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 87c8a9a..a4cde27 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -103,7 +103,6 @@ nameinfo:
   rautavaara.debian.org: Einojuhani Rautavaara (b. October 9th, 1928)
   rainier.debian.org: Ivy Priaulx Rainier (February 3rd, 1903 - October 10th, 1986) 
   rapoport.debian.org: Eda Rothstein Rapoport (December 25th, 1890 - May 9th, 1968)
-  ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19th, 1873 - May 11th, 1916)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
   saens.debian.org: Charles-Camille Saint-Saëns  (October 9th, 1835 - December 16th, 1921)
@@ -183,7 +182,6 @@ host_settings:
   not-bacula-client:
     # decommissioning
     - rautavaara.debian.org
-    - ravel.debian.org
     # dead/not running
     - berlioz.debian.org
     # mirrors, secondaries, syncproxies

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 232aa12..0e14027 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [glinka,klecker,ravel,rietz,sibelius] {
+       if $::hostname in [glinka,klecker,rietz,sibelius] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index 2fc6380..4401fbe 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -141,7 +141,6 @@
 @def $BUILDD_SSH_ACCESS = ();
 @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 5.153.231.18); # wuiet
 @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 97.107.116.29); # master
-@def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 206.12.19.5); # ravel
 @def $BUILDD_SSH_ACCESS = ($BUILDD_SSH_ACCESS 82.195.75.110); # new-master
 @def $FREEBSD_SSH_ACCESS = ();
 @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $BUILDD_SSH_ACCESS);

diff --git a/modules/roles/files/static-mirroring/static-components.conf b/modules/roles/files/static-mirroring/static-components.conf
index bc1a853..f0584f5 100644 (file)
--- a/modules/roles/files/static-mirroring/static-components.conf
+++ b/modules/roles/files/static-mirroring/static-components.conf
@@ -3,7 +3,6 @@
 
 bizet.debian.org       bits.debian.org                 master.debian.org               /srv/bits-master.debian.org/htdocs
 bizet.debian.org       network-test.debian.org         master.debian.org               /srv/network-test.debian.org/htdocs
-bizet.debian.org       news.debian.net                 ravel.debian.org                /srv/news.debian.net/htdocs
 bizet.debian.org       planet.debian.org               philp.debian.org                /srv/planet.debian.org/www
 bizet.debian.org       www.debian.org                  wolkenstein.debian.org          /srv/www.debian.org/www
 dillon.debian.org      blends.debian.org               dillon.debian.org               /srv/blends.debian.org/www
@@ -12,6 +11,7 @@ dillon.debian.org     debaday.debian.net              dillon.debian.org               /srv/debaday.debian.net
 dillon.debian.org      dsa.debian.org                  dillon.debian.org               /srv/dsa.debian.org/htdocs
 dillon.debian.org      lintian.debian.org              lindsay.debian.org              /srv/lintian.debian.org/www
 dillon.debian.org      mozilla.debian.net              dillon.debian.org               /srv/mozilla.debian.net/htdocs
+dillon.debian.org      news.debian.net                 dillon.debian.org               /srv/news.debian.net/htdocs
 dillon.debian.org      rtc.debian.org                  dillon.debian.org               /srv/rtc.debian.org/htdocs
 dillon.debian.org      security-team.debian.org        dillon.debian.org               /srv/security-team.debian.org/htdocs
 dillon.debian.org      wnpp-by-tags.debian.net         dillon.debian.org               /srv/wnpp-by-tags.debian.net/www

diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp
index a63c1c2..aa5e7d7 100644 (file)
--- a/modules/roles/manifests/weblog_provider.pp
+++ b/modules/roles/manifests/weblog_provider.pp
@@ -6,7 +6,7 @@ class roles::weblog_provider {
                }
        } else {
                file { '/etc/cron.d/puppet-weblog-provider':
-                       content => "SHELL=/bin/bash\n\n0 */4 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@ravel:-weblogs-incoming-\n",
+                       content => "SHELL=/bin/bash\n\n0 */4 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@rXXXXX:-weblogs-incoming-\n",
                }
        }
 }

diff --git a/modules/ssh/templates/sshd_config.erb b/modules/ssh/templates/sshd_config.erb
index e1b4b3c..947a254 100644 (file)
--- a/modules/ssh/templates/sshd_config.erb
+++ b/modules/ssh/templates/sshd_config.erb
@@ -9,7 +9,6 @@
 # What ports, IPs and protocols we listen for
 Port 22
 <%= extraports = case fqdn
-                        when "ravel.debian.org" then "Port 443"
                         when "paradis.debian.org" then "
 ListenAddress 0.0.0.0:22
 ListenAddress [::]:22