retire couper, popov

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 78cbfb5..af8c675 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -74,7 +74,6 @@ roles:
   piuparts:
     - pejacevic.debian.org
   popcon:
-    - popov.debian.org
     - pinel.debian.org
   pubsub:
     - rainier.debian.org

diff --git a/modules/autofs/manifests/init.pp b/modules/autofs/manifests/init.pp
index 7d8a12d..d9166f9 100644 (file)
--- a/modules/autofs/manifests/init.pp
+++ b/modules/autofs/manifests/init.pp
@@ -1,6 +1,6 @@
 class autofs {
        case $::hostname {
-               pejacevic, piu-slave-bm-a, picconi, coccia, couper, dillon, donizetti, ticharich, delfin, quantz, sor, lindsay, mekeel, pittar, pinel: {
+               pejacevic, piu-slave-bm-a, picconi, coccia, dillon, donizetti, ticharich, delfin, quantz, sor, lindsay, mekeel, pittar, pinel: {
                        include autofs::bytemark
                }
                lw07,lw08: {

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 3842f8a..eb5d17c 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -22,7 +22,6 @@ nameinfo:
   chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
   coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833)
   corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
-  couper.debian.org: Mildred Couper (1887 - 1974)
   czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
   danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
   delfin.debian.org: Carmelina Delfin (c. 1900 - after 1948)
@@ -89,7 +88,6 @@ nameinfo:
   pinel.debian.org: Julie Pinel (fl. 1710 - 1737)
   pittar.debian.org: Fanny Krumpholtz Pittar (1785 - 1815)
   plummer.debian.org: John Plummer (c. 1410 - c. 1483)
-  popov.debian.org: Gavriil Nikolayevich Popov (Гаврии́л Никола́евич Попо́в) (September 12th, 1904 - February 17th, 1972)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
   portman.debian.org: Rachel Portman (11 December 1960 - )
   poulenc.debian.org: Francis Jean Marcel Poulenc (January 7th, 1899 - January 30th, 1963)
@@ -155,7 +153,6 @@ host_settings:
     - nono.debian.org
     - picconi.debian.org
     - pinel.debian.org
-    - popov.debian.org
     - quantz.debian.org
     - reger.debian.org
     - tye.debian.org

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index 14f53d6..7eaeac2 100644 (file)
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -14,7 +14,6 @@ vdoms = case @fqdn
        when "picconi.debian.org" then "packages.debian.org: user=pkg_user group=Debian directory=/srv/packages.debian.org/mail/"
 
         when "pinel.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
-        when "popov.debian.org" then "popcon.debian.org: user=popcon group=popcon directory=/srv/popcon.debian.org/mail/"
 
         when "quantz.debian.org" then "qa.debian.org: user=qa group=qa directory=/srv/qa.debian.org/mail/
 packages.qa.debian.org: user=qa group=qa directory=/srv/packages.qa.debian.org/mail"

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index fa7f295..187daba 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -284,13 +284,13 @@ class ferm::per-host {
                ullmann: {
                        @ferm::rule { 'dsa-postgres-udd':
                                description     => 'Allow postgress access',
-                               # quantz, moszumanska, master, couper, coccia, franck
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))'
+                               # quantz, moszumanska, master, coccia, franck
+                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.11/32 138.16.160.12/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-udd6':
                                domain          => '(ip6)',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
                        }
                }
                franck: {
@@ -317,12 +317,12 @@ class ferm::per-host {
                bmdb1: {
                        @ferm::rule { 'dsa-postgres-main':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32))'
+                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32))'
                        }
                        @ferm::rule { 'dsa-postgres-main6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128))'
+                               rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128))'
                        }
                        @ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access',

diff --git a/modules/multipath/templates/multipath-bm.conf.erb b/modules/multipath/templates/multipath-bm.conf.erb
index 09aa148..16e328d 100644 (file)
--- a/modules/multipath/templates/multipath-bm.conf.erb
+++ b/modules/multipath/templates/multipath-bm.conf.erb
@@ -48,14 +48,6 @@ multipaths {
                wwid    3600c0ff000d5ad34ac83635401000000
                alias   coccia-lvm
        }
-       multipath {
-               wwid    3600c0ff000d5ad34cd996b5401000000
-               alias   couper
-       }
-       multipath {
-               wwid    3600c0ff000d83a7048ef105201000000
-               alias   couper-srv
-       }
        multipath {
                wwid    3600c0ff000d5ad34389b6b5401000000
                alias   delfin

diff --git a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
index 17dd166..2674428 100644 (file)
--- a/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
+++ b/modules/multipath/templates/multipath-ubc-ganeti.conf.erb
@@ -80,15 +80,6 @@ multipaths {
                 wwid 3600c0ff000d5f6bdf38f9b5101000000
                 alias r10-jenkins
         }
-        # popov
-        multipath {
-                wwid 3600c0ff000d5f6bda9a19b5101000000
-                alias r10-popov
-        }
-        multipath {
-                wwid 3600c0ff000d5f6bdaaa19b5101000000
-                alias r10-popov-srv
-        }
         # fano
         multipath {
                 wwid 3600c0ff000d5f6bd71c19c5101000000