From 215a052cae9e4e1862c9ce67461ae4091d95371d Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Sun, 14 Aug 2011 12:34:02 +0200 Subject: [PATCH] remove merkel Signed-off-by: Martin Zobel-Helas --- modules/apache2/manifests/init.pp | 2 +- modules/apache2/templates/default-debian.org.erb | 14 -------------- modules/debian-org/misc/local.yaml | 3 --- modules/exim/templates/virtualdomains.erb | 2 -- modules/portforwarder/misc/config.yaml | 5 ----- modules/ssh/templates/authorized_keys.erb | 1 - modules/sudo/files/common/sudoers | 2 +- 7 files changed, 2 insertions(+), 27 deletions(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index f5c6f80c3..4487eef50 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -154,7 +154,7 @@ class apache2 { } case $hostname { - busoni,duarte,holter,lindberg,master,merkel,powell,rore: { + busoni,duarte,holter,lindberg,master,powell,rore: { @ferm::rule { "dsa-http-limit": prio => "20", description => "limit HTTP DOS", diff --git a/modules/apache2/templates/default-debian.org.erb b/modules/apache2/templates/default-debian.org.erb index b07bed535..84f4533e2 100644 --- a/modules/apache2/templates/default-debian.org.erb +++ b/modules/apache2/templates/default-debian.org.erb @@ -16,20 +16,6 @@ ServerSignature On <%= out = case fqdn - when "merkel.debian.org" - then " - RemoveType .php .phtml .php3 .phps - php_admin_flag engine off - - SetEnv PERLLIB \"/home/don/perl/usr/share/perl5:/home/don/source/\" - SetEnv DEBBUGS_CONFIG_FILE \"/home/don/config_internal\" - SetHandler cgi-script - AllowOverride None - Options +ExecCGI - Order allow,deny - Allow from all - -" when "master.debian.org" then "" else " diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 6433dd03f..fb76a6abb 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -62,7 +62,6 @@ nameinfo: mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004) mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845) merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924) - merkel.debian.org: Gustav (Adolf) Merkel (November 12th, 1827 - October 30th, 1885) merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604) morricone.debian.org: Ennio Morricone (November 10th, 1928 - ) mundy.debian.org: William Mundy (c. 1529 - 1591) @@ -142,7 +141,6 @@ services: packagesmaster: powell.debian.org packagesqamaster: master.debian.org puppetmaster: handel.debian.org - qamaster: merkel.debian.org rtmaster: - reger.debian.org host_settings: @@ -157,7 +155,6 @@ host_settings: - kokkonen.debian.org - master.debian.org - merikanto.debian.org - - merkel.debian.org - morricone.debian.org - nono.debian.org - powell.debian.org diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb index d969960dd..7f996dffc 100644 --- a/modules/exim/templates/virtualdomains.erb +++ b/modules/exim/templates/virtualdomains.erb @@ -46,8 +46,6 @@ debian.org: user=debian group=Debian directory=/org/debian.org/mail debian.com: user=nobody group=Debian directory=/org/star.debian.star/ debian.net: user=nobody group=Debian directory=/org/star.debian.star/" - when "merkel.debian.org" then "nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/" - when "morricone.debian.org" then "backports.debian.org: user=dak group=backports directory=/srv/backports-master.debian.org/mail/" when "nono.debian.org" then "nm.debian.org: user=nm group=nm directory=/srv/nm.debian.org/mail/" diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml index 1d723c9b7..d47c2ce10 100644 --- a/modules/portforwarder/misc/config.yaml +++ b/modules/portforwarder/misc/config.yaml @@ -10,11 +10,6 @@ master.debian.org: target_host: samosa.debian.org target_port: 5441 -merkel.debian.org: - - source_bind_port: 5441 - target_host: samosa.debian.org - target_port: 5441 - samosa.debian.org: - source_bind_port: 5433 target_host: grieg.debian.org diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index bc85e7741..3e96b4d04 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -18,7 +18,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwbRijHuvIC6cZUZwUfqLT5t/4GRvqiBBmYXkRRhwMajT when "sperger.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuXKdZTW+Ju0p+4pBXPFSEF9lyav7x5yR0P0Gk6NijfWIbx6DQKbCccR0PobDL+To1dtCP9JbOr3zZjV0VaRpMqlfjH1DR/SkI7orcomwh0fFYzygx2OZ9HJCYv2UERRsKEt3GJr2yFEaNSLg25tIOpvwsHSIQHt8hg5h6sdyzgCrEvwfCImncdyp1WssqFp70TXyRWnSSzq8cMH1zE8B9uoPATTVjcFB6E8+HuY5KSd8Thg2jQ+2pFLj8D0VNMj9nCVRlDOhunkfMzS7rx3eBl3oqxgIL8SWfB7aZKdEb77RXemUBvNDghWTaQxgXlOQP4v/cVrg03TNlcM5kbZqIeBidfzF5C1lcZOuAMlZYSq+bpdBC9j+dT2Lr/blNatN7LKLYVaQ+W7a6zAvmfubr+vjhO+JUY8XT9wmFlY+o1wYaup455LA3pmKhBPGpcNtaZ7FEotGNYTXjpTbpzMp6vvOXf3n325GWS9so9e6PTbuvdJdRO5Et69kV5dqP4XwUT3d3SQs5W16Rj6QF0Aod2QFEaIpZu52fkyt4dAn0WCRnDR2PB9n99CDZ4f4mKg66u6oNT3RUcMtK1lHyhxlFdjG7qJ2EwnqLbTpvWq8qD5zzc/uJwy9eK5RqQhXMtIP+2FN7o2cfw2n8tUx4LIeCMZ8pcVHgY17M2v/oBLn+IU= bzed@think" when "tartini.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAmXjNW2OoDl7mwAyzHHNMMfuGGor6Vgr2LiKdlVmRCk6EeqrYrRY4ZYsJ2c0nBNzvzgxLO/deau/LBYdpNIO5341GvSWWIA+2khXY+Fzb35UGt4J5eZWOLYsJmplM3xm9lde404WOgqqu0ywsXJMxYmQtqzUjI/tFA5zyE2baPpMjnYyfmxPPOXdv7L6uK5qaWGZFBp8iVJxYwvUTADstAz077kiBpaZoEG1jr8kEzwd2so9cNDGq4wmjF2xv3M2i/rmSLgoLGeI6GtgTL3BU39CXFXa9y5sMRf4opxSzV2JwGtXbhmtqkHZAXufMndRmEy9IyOkFsJvUJoUe0n+Hhwo/JGiXC2vBGA0ueeMXtUgjYs11cprd6rVI8+WZMND9YOdwS71aWXiX5zN36F3JdaND4yblLpATprHp6/npYCSI5IC/42m4AbWu6aj85SC9Bnegb+FkLCUIcXQ/STPr9ptaaRCNBucbSAovJ84k6Ny2qwUfSYT3zWkL6hl5JnIv9y4HbfFHAD2e4dCXidb8H3/X8H/giwPvtOLwiHf8r+Kxya6JuYzo/ZoGhQhP2MnfyxapoqG+kixU0pPaPN39trraTOzZNXIPOxyyuGhu77x4oh4uNBqnpr2aR1xi+/qvSK0f/BO0AyHLRZXtTbn9Bjr588Vb/Cx9t0aKGJCSPoE= jeroen@eee.wolffelaar.nl 2008-05-14" - when "merkel.debian.org" then "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA20LXSNAyeEG79dqm7n10qbo80Mk7Gn4txysxVZJhDKA9RWEXEykSSXtrQKFUCdZV28bN18QLdJJhYr9NcmJSGq46Mx/OoySwN+Ow5s5f4rAA2nkuDRAVNYZM4ynDXO70a0oWsJ4bKGYOrzkni63Wq0y1Gj7hITEpF3pZBrWYCfxXeQ+ekdiYQ7+GVN3DESWL3ywqJCOGdTNfDUflhShf6h0EbWwfepb9HmKF970/0i338DESsforRtZuAtWjVvThckhVZvcB1CPyPy3Z4tBQaLHKfOQzoK/lnqj7sS0Mw8fmUU2Zh/a+DDAbA2AAQxodzAU28GbpG1Et9nGaDFgIAw== merkel backup to raff 20101001" end localkeys %> diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index 7f874723c..516cf402a 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -21,7 +21,7 @@ Defaults env_reset Defaults passprompt="[sudo] password for %u on %h: " # Host alias specification -Host_Alias QAHOSTS = master, merkel, quantz +Host_Alias QAHOSTS = master, quantz Host_Alias WEBHOSTS = wolkenstein Host_Alias SECHOSTS = chopin Host_Alias FTPHOSTS = franck, morricone -- 2.20.1