From 4700a4c512f049ac4cfae3d7ab27c022a682b53c Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Thu, 8 Dec 2016 15:14:36 +0100 Subject: [PATCH] decommission franck Signed-off-by: Aurelien Jarno --- hieradata/common.yaml | 1 - modules/debian-org/misc/local.yaml | 1 - modules/exim/templates/eximconf.erb | 1 - modules/ferm/manifests/per-host.pp | 29 ++++------------------------- modules/sudo/files/sudoers | 5 +---- 5 files changed, 5 insertions(+), 32 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 8db370163..b8f6257ea 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -35,7 +35,6 @@ roles: - klecker.debian.org ftp_master: - fasolo.debian.org - - franck.debian.org ftp.upload.d.o: - coccia.debian.org - usper.debian.org diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 605b8bcf1..3e159fe53 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -37,7 +37,6 @@ nameinfo: 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) fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746) - franck.debian.org: Melchior Franck (1579 - June 1st, 1639) gideon.debian.org: Miriam Gideon (October 23rd, 1906 - June 18th, 1996) gigault.debian.org: Nicolas Gigault (ca. 1627 - August 20th, 1707) glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857) diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb index 71fc945fc..c3841ccac 100644 --- a/modules/exim/templates/eximconf.erb +++ b/modules/exim/templates/eximconf.erb @@ -1025,7 +1025,6 @@ check_message: begin rewrite -\N^buildd_(.*)@franck\.debian\.org$\N buildd_$1@buildd.debian.org T \N^buildd_(.*)@fasolo\.debian\.org$\N buildd_$1@buildd.debian.org T *@debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T *@people.debian.org ${lookup{$1}cdb{/var/lib/misc/${primary_hostname}/mail-forward.cdb}{$value}fail} T diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index dd76d4d30..9bc01bc14 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -284,8 +284,8 @@ class ferm::per-host { ullmann: { @ferm::rule { 'dsa-postgres-udd': description => 'Allow postgress access', - # 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 ))' + # quantz, moszumanska, master, coccia + 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 ))' } @ferm::rule { 'dsa-postgres-udd6': domain => '(ip6)', @@ -314,27 +314,6 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' } } - franck: { - @ferm::rule { 'dsa-postgres-franck': - description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))' - } - @ferm::rule { 'dsa-postgres-franck6': - domain => 'ip6', - description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:10/128 ))' - } - - @ferm::rule { 'dsa-postgres-backup': - description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))' - } - @ferm::rule { 'dsa-postgres-backup6': - domain => 'ip6', - description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))' - } - } bmdb1: { @ferm::rule { 'dsa-postgres-main': description => 'Allow postgress access', @@ -355,9 +334,9 @@ class ferm::per-host { rule => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))' } @ferm::rule { 'dsa-postgres-wannabuild': - # wuiet, ullmann, franck + # wuiet, ullmann description => 'Allow postgress access', - rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 138.16.160.12/32 ))' + rule => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 ))' } @ferm::rule { 'dsa-postgres-wannabuild6': domain => 'ip6', diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 15bfad150..c58444240 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -25,7 +25,7 @@ Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/ Host_Alias VOIPHOSTS = vogler Host_Alias WEBHOSTS = wolkenstein Host_Alias SECHOSTS = seger -Host_Alias FTPHOSTS = franck, fasolo +Host_Alias FTPHOSTS = fasolo Host_Alias ZIVITHOSTS = zelenka, zandonai Host_Alias AACRAIDHOSTS = pettersson Host_Alias MEGARAIDHOSTS = rautavaara, sibelius @@ -63,7 +63,6 @@ nagios handel=(puppet) NOPASSWD: /usr/lib/nagios/plugins/dsa-check-cert-expire # with smartarray controllers nagios ALL=(ALL) NOPASSWD: /sbin/hpasmcli "" nagios ALL=(ALL) NOPASSWD: /usr/bin/arrayprobe "" -nagios franck=(ALL) NOPASSWD: /usr/bin/arrayprobe -f /dev/cciss/c1d0 nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller all show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld all show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] ld [0-9] show @@ -72,7 +71,6 @@ nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd [0-9]\: nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=[0129] show status -nagios franck=(ALL) NOPASSWD: /usr/sbin/hpssacli controller slot=1 enclosure 1E\:1 show detail nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller all show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld all show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] ld [0-9] show @@ -81,7 +79,6 @@ nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9]\: nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9] show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] pd [0-9][EIC]\:[0-9]\:[0-9][0-9] show nagios ALL=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=[0129] show status -nagios franck=(ALL) NOPASSWD: /usr/sbin/hpacucli controller slot=1 enclosure 1E\:1 show detail # other raid controllers nagios AACRAIDHOSTS=(ALL) NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD -- 2.20.1