decommission petrova (RT#7978)

diff --git a/data/common.yaml b/data/common.yaml
index 4cc1d20..ed9fdc2 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -69,9 +69,6 @@ roles::ftp_master::db_port: 5433
 roles::nm::db_address: danzi.debian.org
 roles::nm::db_port: 5433
 
-roles::pet::params::db_address: bmdb1.debian.org
-roles::pet::params::db_port: 5435
-
 roles::postgresql::ftp_master_dak_replica::db_guest_access::bm::db_address: bmdb1.debian.org
 roles::postgresql::ftp_master_dak_replica::db_guest_access::bm::db_port: 5434
 

diff --git a/data/nodes/petrova.debian.org.yaml b/data/nodes/petrova.debian.org.yaml
deleted file mode 100644 (file)
index b884b01..0000000
--- a/data/nodes/petrova.debian.org.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-classes:
-  - roles::pet

diff --git a/modules/debian_org/files/misc/local.yaml b/modules/debian_org/files/misc/local.yaml
index 4a153fb..cc5795d 100644 (file)
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@ -57,7 +57,6 @@ nameinfo:
   olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
   paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
   pejacevic: Dora Pejačević (September 10th, 1885 - March 5th, 1923)
-  petrova.debian.org: Mara Petrova (May 15th, 1921 - June 7th. 1997)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   philp.debian.org: Elizabeth Philp (1827 - November 26th, 1885)
   picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)

diff --git a/modules/roles/manifests/pet.pp b/modules/roles/manifests/pet.pp
deleted file mode 100644 (file)
index ca3ce3b..0000000
--- a/modules/roles/manifests/pet.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-# pet.debian.org role
-#
-# @param db_address     hostname of the postgres server for this service
-# @param db_port        port of the postgres server for this service
-class roles::pet (
-  String  $db_address = $roles::pet::params::db_address,
-  Integer $db_port    = $roles::pet::params::db_port,
-) inherits roles::pet::params {
-  include apache2
-  ssl::service { 'pet.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-  ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
-
-  @@postgres::cluster::hba_entry { "pet-${::fqdn}":
-    tag      => "postgres::cluster::${db_port}::hba::${db_address}",
-    pg_port  => $db_port,
-    database => ['pet', 'pet-devel'],
-    user     => 'pet',
-    address  => $base::public_addresses,
-  }
-}

diff --git a/modules/roles/manifests/pet/db_guest_access.pp b/modules/roles/manifests/pet/db_guest_access.pp
deleted file mode 100644 (file)
index ac76e4c..0000000
--- a/modules/roles/manifests/pet/db_guest_access.pp
+++ /dev/null
@@ -1,25 +0,0 @@
-# pet guest access to DB
-#
-# @param db_address       hostname of the postgres server for this service
-# @param db_port          port of the postgres server for this service
-# @param database         list of databases to give access to
-# @param address          hosts to give access
-# @param connection_type  connection type
-class roles::pet::db_guest_access (
-  String  $db_address     = $roles::pet::params::db_address,
-  Integer $db_port        = $roles::pet::params::db_port,
-  Array[String] $database = ['pet'],
-  Enum['local', 'host', 'hostssl'] $connection_type = 'hostssl',
-  Optional[Variant[Stdlib::IP::Address, Array[Stdlib::IP::Address]]] $address = $base::public_addresses,
-) inherits roles::pet::params {
-  @@postgres::cluster::hba_entry { "pet-guest-${::fqdn}":
-    tag             => "postgres::cluster::${db_port}::hba::${db_address}",
-    pg_port         => $db_port,
-    database        => $database,
-    user            => 'guest',
-    address         => $address,
-    connection_type => $connection_type,
-    method          => 'trust',
-    order           => '25',
-  }
-}

diff --git a/modules/roles/manifests/pet/params.pp b/modules/roles/manifests/pet/params.pp
deleted file mode 100644 (file)
index ab73a2b..0000000
--- a/modules/roles/manifests/pet/params.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# pet parameters
-#
-# @param db_address     hostname of the postgres server for this service
-# @param db_port        port of the postgres server for this service
-class roles::pet::params (
-  String  $db_address = $roles::pet::db_address,
-  Integer $db_port    = $roles::pet::db_port,
-) {
-}

diff --git a/modules/roles/manifests/pubsub/entities.pp b/modules/roles/manifests/pubsub/entities.pp
index f78ba85..24d43c5 100644 (file)
--- a/modules/roles/manifests/pubsub/entities.pp
+++ b/modules/roles/manifests/pubsub/entities.pp
@@ -16,7 +16,6 @@ class roles::pubsub::entities {
        $mailadm_password = $roles::pubsub::params::mailadm_password
        $mailly_password  = $roles::pubsub::params::mailly_password
        $muffat_password  = $roles::pubsub::params::muffat_password
-       $pet_password     = $roles::pubsub::params::pet_password
 
        rabbitmq_user { 'admin':
                admin    => true,
@@ -53,11 +52,6 @@ class roles::pubsub::entities {
                password => $muffat_password,
        }
 
-       rabbitmq_user { 'pet-devel':
-               admin    => false,
-               password => $pet_password,
-       }
-
        $do_hosts = keys($deprecated::localinfo)
 
        pubsub::autouser { $do_hosts: }
@@ -74,10 +68,6 @@ class roles::pubsub::entities {
                ensure   => present,
        }
 
-       rabbitmq_vhost { 'pet':
-               ensure   => present,
-       }
-
        rabbitmq_user_permissions { 'admin@/':
                configure_permission => '.*',
                read_permission      => '.*',
@@ -102,12 +92,6 @@ class roles::pubsub::entities {
                write_permission     => '.*',
        }
 
-       rabbitmq_user_permissions { 'admin@pet':
-               configure_permission => '.*',
-               read_permission      => '.*',
-               write_permission     => '.*',
-       }
-
        rabbitmq_user_permissions { 'ftpteam@packages':
                configure_permission => '.*',
                read_permission      => '.*',
@@ -137,12 +121,6 @@ class roles::pubsub::entities {
                write_permission     => '.*',
        }
 
-       rabbitmq_user_permissions { 'pet-devel@pet':
-               configure_permission => '.*',
-               read_permission      => '.*',
-               write_permission     => '.*',
-       }
-
        rabbitmq_policy { 'mirror-dsa@dsa':
                pattern    => '.*',
                priority   => 0,
@@ -173,16 +151,6 @@ class roles::pubsub::entities {
                },
        }
 
-       rabbitmq_policy { 'mirror_pet@pet':
-               pattern    => '.*',
-               priority   => 0,
-               applyto    => 'all',
-               definition => {
-                       'ha-mode'      => 'all',
-                       'ha-sync-mode' => 'automatic',
-               },
-       }
-
        rabbitmq_plugin { 'rabbitmq_management_agent':
                ensure   => present,
        }

diff --git a/modules/roles/manifests/udd.pp b/modules/roles/manifests/udd.pp
index a6f4c2d..7aebd39 100644 (file)
--- a/modules/roles/manifests/udd.pp
+++ b/modules/roles/manifests/udd.pp
@@ -10,7 +10,6 @@ class roles::udd {
   }
 
   include roles::buildd_master::db_guest_access
-  include roles::pet::db_guest_access
 
   class { 'roles::udd::db_guest_access':
     database        => ['udd', 'udd-dev'],

diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers
index 6c9a72e..db0d9d5 100644 (file)
--- a/modules/sudo/files/sudoers
+++ b/modules/sudo/files/sudoers
@@ -160,7 +160,6 @@ git         godard=(salsa-pages)    NOPASSWD: ALL
 %contributors  ALL=(contributors)      ALL
 %contributors  ALL=(contributors-web)  ALL
 %patch-tracker ALL=(patch-tracker)     ALL
-%pet-devel     ALL=(pet-devel) ALL
 %piuparts      ALL=(piupartsm) ALL
 %piuparts      ALL=(piupartss) ALL
 %pkg_maint     ALL=(pkg_user)  ALL