From: Martin Zobel-Helas Date: Wed, 22 Dec 2010 14:36:53 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e733600e917f78330b957715d1a2cf6d06c18963;hp=fc59b4e53b426aeb2d321236cc115b0e241414f9;p=dsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: remove cimarosa remove bartok one of the two machines I use to access the BSD machines (field, finzi, fano, fasch) got its IP changed recently ignore some pg9 related packages on sibelius and stabile Set up port forwarding from stabile to sibelius --- diff --git a/manifests/site.pp b/manifests/site.pp index 4594a12c..2a274629 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -93,7 +93,7 @@ node default { case $hostname { klecker,ravel,senfl,orff,draghi: { include named::authoritative } geo1,geo2,geo3: { include named::geodns } - bartok,franck,liszt,master,samosa,schein,spohr,steffani,widor: { include named::recursor } + franck,liszt,master,samosa,schein,spohr,steffani,widor: { include named::recursor } } case $kernel { @@ -125,7 +125,7 @@ node default { byrd,schuetz: { include krb } - bartok,draghi,quantz,samosa: { + draghi,quantz,samosa: { include krb include afs } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index d8dd7453..bdffddbe 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -13,7 +13,6 @@ nameinfo: arne.debian.org: Thomas Augustine Arne (1710 - 1778) arnold.debian.org: Malcolm Henry Arnold (1921 - 2006) barber.debian.org: Samuel Barber (March 9th, 1910 - January 23rd, 1981) - bartok.debian.org: Béla Viktor János Bartók (March 25th, 1881 - September 26th, 1945) beethoven.debian.org: Ludwig van Beethoven (December 16th, 1770 - March 26th, 1827) bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835) biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704) @@ -22,7 +21,6 @@ nameinfo: byrd.debian.org: William Byrd (1543 - July 4th, 1623) chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849) cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950) - cimarosa.debian.org: Domenico Cimarosa (17 December 1749 - 11 January 1801) corelli.debian.org: Arcangelo Corelli (February 17th, 1653 – January 8th, 1713) dijkstra.debian.org: Lowell Dijkstra (b.1952) draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700) @@ -247,14 +245,12 @@ host_settings: arnold.debian.org: mailout.debian.org ball.debian.org: mailout.debian.org barber.debian.org: mailout.debian.org - bartok.debian.org: mailout.debian.org beethoven.debian.org: mailout.debian.org biber.debian.org: mailout.debian.org brahms.debian.org: mailout.debian.org byrd.debian.org: mailout.debian.org caballero.debian.org: mailout.debian.org cilea.debian.org: mailout.debian.org - cimarosa.debian.org: mailout.debian.org corelli.debian.org: mailout.debian.org crest.debian.org: mailout.debian.org dijkstra.debian.org: mailout.debian.org diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index f0661f9d..0e9842a7 100644 --- a/modules/ferm/templates/defs.conf.erb +++ b/modules/ferm/templates/defs.conf.erb @@ -195,7 +195,7 @@ @def $USER_kibi = ($USER_kibi 88.164.242.219); # home.ikibiki.org @def $USER_kibi = ($USER_kibi 82.244.158.68); # @parents' @def $USER_aurel32 = (); -@def $USER_aurel32 = ($USER_aurel32 88.191.82.174); # hall.aurel32.net +@def $USER_aurel32 = ($USER_aurel32 88.191.126.93); # hall.aurel32.net @def $USER_aurel32 = ($USER_aurel32 82.232.2.251); # farad.aurel32.net @def $FREEBSD_SSH_ACCESS = (); @def $FREEBSD_SSH_ACCESS = ($FREEBSD_SSH_ACCESS $DSA_IPS $USER_kibi $USER_aurel32); diff --git a/modules/ferm/templates/me.conf.erb b/modules/ferm/templates/me.conf.erb index b88d974a..f2f13a3b 100644 --- a/modules/ferm/templates/me.conf.erb +++ b/modules/ferm/templates/me.conf.erb @@ -6,7 +6,7 @@ <%= out = [] -restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 bartok beethoven tchaikovsky schroeder heininen handel lotti} +restrict_ssh = %w{lebrun logtest01 geo1 geo2 geo3 beethoven tchaikovsky schroeder heininen handel lotti} ssh4allowed = [] ssh6allowed = [] @@ -23,7 +23,7 @@ if %w{lebrun schroeder}.include?(hostname) then ssh4allowed << '70.103.162.29' # master ssh4allowed << '82.195.75.84' # nott.ayous.org, HE (builddadm) end -if %w{bartok beethoven}.include?(hostname) then +if %w{beethoven}.include?(hostname) then ssh4allowed << '$HOST_DEBIAN_V4' ssh6allowed << '$HOST_DEBIAN_V6' end diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index c949fb41..6a543ead 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -6,13 +6,14 @@ <%= ignore = [] case fqdn -when /(bellini|cimarosa).debian.org/: ignore << "mcelog" +when "bellini.debian.org": ignore << "mcelog" when "busoni.debian.org": ignore << %w{libthreads-perl libthreads-shared-perl} when "cilea.debian.org": ignore << "/freeswitch.*/" when /draghi.debian.org/: ignore << %w{userdir-ldap libheimdal-kadm5-perl} when /orff.debian.org/: ignore << %w{libnet-dns-sec-perl libnet-dns-zone-parser-perl} when /liszt.debian.org/: ignore << "amavisd-new" -when /stabile.debian.org/: ignore << "xfsprogs" +when /stabile.debian.org/: ignore << %w{xfsprogs postgresql-9.0-debversion} +when /sibelius.debian.org/: ignore << %w{postgresql-9.0 postgresql-9.0-debversion libpq5 postgresql-contrib-9.0 postgresql-client-9.0 postgresql-plperl-9.0} when /(zandonai|zelenka).debian.org/: ignore << %w{zabbix-agent rrdcollect} when /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm" when /(lebrun|schroeder).debian.org/: ignore << "firmware-linux-nonfree" diff --git a/modules/portforwarder/misc/config.yaml b/modules/portforwarder/misc/config.yaml index cb81030e..4449f37b 100644 --- a/modules/portforwarder/misc/config.yaml +++ b/modules/portforwarder/misc/config.yaml @@ -40,3 +40,9 @@ nono.debian.org: - source_bind_port: 5433 target_host: merkel.debian.org target_port: 5433 + +stabile.debian.org: + # snapshot postgresql streaming replication. sibelius is the master, stabile the slave. + - source_bind_port: 15433 + target_host: sibelius.debian.org + target_port: 5433 diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb index 039530aa..2d991521 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -36,7 +36,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAqtZYwCwuLP2KZOfqdRyKbexfhcfEiwY7en7aYmY7eUxa ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6BZNqvY/6aRBxCNU55e5JZKa7D1qKMG0upZFCOl5K36uv0KXlCvIMgaQqQcce41dtNRmiyHpw3LXqdV2qJNpJAXMpsEN4F/STkftTOcFhI9nhz88IIwsboCErla1W8NxxRkBU0FxpT4Zn1wBlq30o12gtBFs3lO+nE7+k8H8I791V+3kjVAXCDh5Ep8BY4Bg8eSuhwUgmiNvWf6E6/D0s9pFJdAMFKFLPivsnc13nfgYDmxZQKrkVV8LqIGaisy7Q3LdQLKBraWYmfQ5idkaPK+EUSERdusG7pB0wzp1ieA1iEkgMRFFLBx22tQmEdmu+Wo3vM77FmNYWvvPKDwKYn1uwg0Kgf1JTWlFwq5C73EG3Q6Vb6ExNPaX/GMDkpi0Km5p2/BIM/jyCmCH+ScFRCtzJoxEg3L7BFdCKgY1bQW2pZDMRQ9nc32+EDUGQQbYp44/8mr4mXqDYV4VElZTqWZ6hJZk1cS7hustO8lJE3Yykp+q/5I0cq7fxe5aLBO5DwTPq9EY/dlcTy8z09Itm/AcJuCipg4I0nQ1cSDTNYn+4NVxoga/yS3gJlU5euXKmcaK9SaRCBIHtWR/Semza3Imvgtgd25bwKI+6VT/fHgqgmvo184NZID099w2E90eE= sgran's root key for debian.org machines <%= machine_keys = case fqdn - when "bartok.debian.org", "beethoven.debian.org" then + when "beethoven.debian.org" then out = '' keyinfo.keys.sort.each do |node| out += '# ' + keyinfo[node]['hostname'].to_s + ' diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index 90d56b9e..defa71ea 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -26,7 +26,7 @@ Host_Alias WEBHOSTS = wolkenstein Host_Alias SECHOSTS = chopin Host_Alias FTPHOSTS = franck, ries Host_Alias ZIVITHOSTS = zelenka, zandonai -Host_Alias AACRAIDHOSTS = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson +Host_Alias AACRAIDHOSTS = bellini, morricone, paganini, respighi, vivaldi, beethoven, pettersson Host_Alias MEGARAIDHOSTS = grieg, rautavaara, sibelius Host_Alias MPTRAIDHOSTS = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field