From 54444a09e6b53214e11e1ed18f71bbf90ba57f65 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 15 Nov 2015 11:56:01 +0100 Subject: [PATCH] decommission chopin Signed-off-by: Julien Cristau --- hieradata/common.yaml | 1 - manifests/site.pp | 2 +- modules/debian-org/misc/local.yaml | 1 - modules/ferm/manifests/per-host.pp | 2 +- modules/postgres/files/backup_server/postgres-make-base-backups | 1 - modules/sudo/files/sudoers | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 9d19f9100..dcb2480b5 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -93,7 +93,6 @@ roles: rtmaster: - reger.debian.org security_master: - - chopin.debian.org - seger.debian.org security_tracker: - soriano.debian.org diff --git a/manifests/site.pp b/manifests/site.pp index 5b95b0c63..93b79b219 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -118,7 +118,7 @@ node default { include samhain } - if $::hostname in [chopin,geo3,wieck] { + if $::hostname in [geo3,wieck] { include debian-org::radvd } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 67d100f6f..592eabae4 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -17,7 +17,6 @@ nameinfo: buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707) byrd.debian.org: William Byrd (1543 - July 4th, 1623) clementi.debian.org: Muzio Clementi (January 23rd, 1752 - March 10th, 1832) - chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849) coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833) czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857) danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826) diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 186376cbb..038b670c9 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -431,7 +431,7 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } - seger,chopin: { + seger: { @ferm::rule { 'dsa-postgres-backup': description => 'Allow postgress access', rule => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))' diff --git a/modules/postgres/files/backup_server/postgres-make-base-backups b/modules/postgres/files/backup_server/postgres-make-base-backups index 8b74853c9..167b4b90d 100755 --- a/modules/postgres/files/backup_server/postgres-make-base-backups +++ b/modules/postgres/files/backup_server/postgres-make-base-backups @@ -87,7 +87,6 @@ while read host port username cluster version; do fi mv "$tmp" "$ROOTDIR/${host%%.*}/$target" done << EOF -chopin.debian.org 5432 debian-backup dak 9.4 bmdb1.debian.org 5435 debian-backup main 9.4 bmdb1.debian.org 5436 debian-backup wannabuild 9.4 danzi.debian.org 5433 debian-backup main 9.4 diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index f5471713d..6f193d4bd 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -24,7 +24,7 @@ Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/ # Host alias specification Host_Alias VOIPHOSTS = vogler Host_Alias WEBHOSTS = wolkenstein -Host_Alias SECHOSTS = chopin, seger +Host_Alias SECHOSTS = seger Host_Alias FTPHOSTS = franck Host_Alias ZIVITHOSTS = zelenka, zandonai Host_Alias AACRAIDHOSTS = beethoven, pettersson -- 2.20.1