decommission fasch. field is history

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 67cb2b82352e3e00e61d96f211c2ac16a7406275..152a73df8fdd509c5c4bf945b2cbac098fd80fe8 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -45,7 +45,6 @@ nameinfo:
   eysler.debian.org: Edmund Samuel Eysler (March 12th, 1874 - October 4th, 1949)
   falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946)
   fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961)
-  fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   fayrfax.debian.org: Robert Fayrfax (April 23rd, 1464 - October 24th, 1521)
   fils.debian.org: Anton Fils (September 22nd, 1733 (baptized) - March 14th, 1760 (buried))
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
@@ -288,9 +287,7 @@ host_settings:
     - eysler.debian.org
     - falla.debian.org
     - fano.debian.org
-    - fasch.debian.org
     - fayrfax.debian.org
-    - field.debian.org
     - fils.debian.org
     - finzi.debian.org
     - fischer.debian.org

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index d6c59dc3fe8a768b41c2f1667492f879124f2f46..85151cca085ca31f5e331643e0e7d092f8400881 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -247,26 +247,6 @@ proto tcp dport (25 submission) daddr ($HOST_MAILRELAY_V4) ACCEPT
 '
                }
        }
-       case $::hostname {
-               rautavaara: {
-                       @ferm::rule { 'dsa-routing':
-                               description     => 'forward chain',
-                               chain           => 'FORWARD',
-                               rule            => 'def $ADDRESS_FASCH=194.177.211.201;
-def $ADDRESS_FIELD=194.177.211.210;
-def $FREEBSD_HOSTS=($ADDRESS_FASCH $ADDRESS_FIELD);
-
-policy ACCEPT;
-mod state state (ESTABLISHED RELATED) ACCEPT;
-interface vlan11 outerface eth0 jump from-kfreebsd;
-interface eth0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
-ULOG ulog-prefix "REJECT FORWARD: ";
-REJECT reject-with icmp-admin-prohibited
-'
-                       }
-               }
-               default: {}
-       }
 
        # redirect snapshot into varnish
        case $::hostname {

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index b5049951c9863f7dc18453f870e1106e0f2796d9..e7e9e5db1980077774f205d1c3a77e2688bb6440 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -29,7 +29,7 @@ Host_Alias    FTPHOSTS        = franck, morricone
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
 Host_Alias     AACRAIDHOSTS    = bellini, morricone, paganini, respighi, beethoven, pettersson
 Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius
-Host_Alias     MPTRAIDHOSTS    = fasch, holter, barber, biber, cilea, vitry, krenek, orff
+Host_Alias     MPTRAIDHOSTS    = holter, barber, biber, cilea, vitry, krenek, orff
 Host_Alias     MEGACTLHOSTS    = lindberg, englund, nielsen
 Host_Alias     LISTHOSTS       = bendel
 Host_Alias     PORTERBOXES     = abel, agricola, barriere, eder, falla, fischer, gabrielli, harris, merulo, partch, smetana, zelenka