no more stabile

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/manifests/site.pp b/manifests/site.pp
index e25c134..5fc1905 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -101,7 +101,7 @@ node default {
        #       include dacs
        #}
 
-       if $::hostname in [stabile,beach,glinka,milanollo,rautavaara,lw01,lw02,lw03,lw04] {
+       if $::hostname in [beach,glinka,milanollo,rautavaara,lw01,lw02,lw03,lw04] {
                include nfs-server
        }
 

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 9f72f68..26f22e7 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -122,7 +122,6 @@ nameinfo:
   storace.debian.org: Stephen Storace (April 4th, 1762 – March 19th, 1796)
   spohr.debian.org: Louis Spohr (April 5th, 1784 - October 22nd, 1859)
   spontini.debian.org: Gaspare Luigi Pacifico Spontini (November 14th, 1774 - January 24th, 1851)
-  stabile.debian.org: Annibale Stabile (~1535 - April 1595)
   steffani.debian.org: Agostino Steffani (July 25th, 1653 - February 12th, 1728)
   tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7th, 1840 - November 6th, 1893)
   ticharich.debian.org: Zdenka Ticharich (September 26th, 1900 - February 15th, 1979)
@@ -177,9 +176,9 @@ host_settings:
     - santoro.debian.org
     - senfl.debian.org
   not-bacula-client:
-    - stabile.debian.org
     # 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 6ae4f2e..76e77a3 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,senfl,sibelius,stabile] {
+       if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',
@@ -171,16 +171,6 @@ class ferm::per-host {
                                rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
                        }
                }
-               stabile: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
                lw07: {
                        @ferm::rule { 'dsa-snapshot-varnish':
                                rule            => '&SERVICE(tcp, 6081)',

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index ed1731e..59464f4 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -184,8 +184,8 @@ dnsadm              denis=(root)                    NOPASSWD: /usr/sbin/service bind9 reload
 dak            FTPHOSTS,SECHOSTS=(archvsync)   NOPASSWD:/home/archvsync/runmirrors
 dak            franck=(backports)      NOPASSWD: /home/backports/bin/update-archive
 # archvsync triggers snapshot
-archvsync      sibelius,stabile=(snapshot)     NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
-archvsync      sibelius,stabile=(snapshot)     NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
+archvsync      sibelius=(snapshot)     NOPASSWD: /srv/snapshot.debian.org/bin/update-trigger
+archvsync      sibelius=(snapshot)     NOPASSWD: /srv/2ndsnapshot/bin/update-trigger
 # dak stuff
 %debian-release        FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *
 %ftpteam       FTPHOSTS=(dak)          /usr/local/bin/dak transitions --import *