From: Peter Palfrader Date: Wed, 9 Dec 2009 20:46:31 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=82b1041c8420f1bacd24edcc938dac995e3658d3;hp=f81d186c233b687cffb9ef63630471960003bffc;p=mirror%2Fdsa-puppet.git Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet --- diff --git a/facts/architecture.rb b/facts/architecture.rb index d6187b238..f0d7ff57e 100644 --- a/facts/architecture.rb +++ b/facts/architecture.rb @@ -11,3 +11,9 @@ Facter.add(:architecture) do end end +Facter.add(:debarchitecture) do + setcode do + %x{/usr/bin/dpkg --print-architecture} + end +end + diff --git a/manifests/site.pp b/manifests/site.pp index 5ffb7a958..33b114927 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -70,7 +70,6 @@ node default { "true": { include buildd } } -# maybe wait for rietz to be upgraded to lenny case $hostname { rietz,raff,klecker: { include named::secondary } } diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 95687d216..bed7a84b7 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -151,7 +151,7 @@ class debian-proliant inherits debian-org { "cpqarrayd": ensure => installed; "arrayprobe": ensure => installed; } - case $architecture { + case $debarchitecture { "amd64": { package { "lib32gcc1": ensure => installed; } } diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml index 265567f96..60a63c11c 100644 --- a/modules/debian-org/misc/hoster.yaml +++ b/modules/debian-org/misc/hoster.yaml @@ -19,6 +19,12 @@ osousl: - 140.211.166.0/25 sanger: - 193.62.202.24/29 +sil: + - 86.59.118.153/28 +scanplus: + - 212.211.132.0/26 + - 212.211.132.248/29 + - 2001:a78::/64 ubcece: - 137.82.84.64/27 - 206.12.19.0/24 diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 58e69b7f2..e1f4ab1eb 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -33,7 +33,9 @@ nameinfo: mahler.debian.org: Gustav Mahler (7 July 1860 - 18 May 1911) mayr.debian.org: Johann(es) Simon Mayr (June 14, 1763 - December 2, 1845) merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885) + mendes.debian.org: Manuel Mendes (c. 1547 - September 24, 1605) merulo.debian.org: Claudio Merulo (8 April 1533 - 4 May 1604) + monteverdi.debian.org: Claudio Giovanni Antonio Monteverdi (15 May 1567 - 29 November 1643) morales.debian.org: Cristóbal de Morales (c. 1500 - between September 4 and October 7, 1553) morricone.debian.org: Ennio Morricone (November 10, 1928 - ) mundy.debian.org: William Mundy (c. 1529 - 1591) @@ -54,7 +56,6 @@ nameinfo: rietz.debian.org: August Wilhelm Julius Rietz (December 28, 1812 - September 12, 1877) rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565) saens.debian.org: Charles-Camille Saint-Saëns (9 October 1835 - 16 December 1921) - sarti.debian.org: Giuseppe Sarti (baptised December 1, 1729 - July 28, 1802) schein.debian.org: Johann Hermann Schein (January 20, 1586 - November 19, 1630) schroeder.debian.org: Hermann Schroeder (1904 - 1984) schumann.debian.org: Robert Alexander Schumann (8 June 1810 - 29 July 1856) @@ -67,24 +68,23 @@ nameinfo: spontini.debian.org: Gaspare Luigi Pacifico Spontini (14 November 1774 - 24 January 1851) stabile.debian.org: Annibale Stabile (~1535 - April 1595) steffani.debian.org: Agostino Steffani (25 July 1653 - 12 February 1728) - strauss.debian.org: Johann Baptist Strauß (October 25, 1825 - June 3, 1899) tartini.debian.org: Giuseppe Tartini (April 8, 1692 - February 26, 1770) unger.debian.org: Caroline Unger (October 28, 1803 - March 23, 1877) valente.debian.org: Vincenzo Valente (February 21, 1855 - September 6, 1921) vivaldi.debian.org: Antonio Lucio Vivaldi (March 4, 1678 - July 28, 1741) voltaire.debian.org: François-Marie Arouet (Voltaire) (21 November 1694 - 30 May 1778) - wagner.debian.org: Wilhelm Richard Wagner (22 May 1813 - 13 February 1883) widor.debian.org: Charles-Marie Jean Albert Widor (February 21, 1844 - March 12, 1937) wieck.debian.org: Clara Josephine Wieck (September 13, 1819 - May 20, 1896) wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445) zelenka.debian.org: Jan Dismas Zelenka (16 October 1679 - 23 December 1745) footer: - bartok.debian.org: "Documentation: gluck:/org/admin.debian.org/doc/backup.debian.org" lebrun.debian.org: "- This host is using an iptables firewall. See /etc/rc.boot/firewall{,6}" schroeder.debian.org: "- This host is using an iptables firewall. See /etc/rc.boot/firewall{,6}" zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]" services: - bugsmaster: rietz.debian.org + bugsmaster: + - busoni.debian.org + - rietz.debian.org bugsmx: - byrd.debian.org mailrelay: @@ -97,16 +97,23 @@ services: host_settings: heavy_exim: - bellini.debian.org + - busoni.debian.org - byrd.debian.org + - chopin.debian.org + - cimarosa.debian.org - draghi.debian.org - klecker.debian.org - master.debian.org - merkel.debian.org + - morricone.debian.org - powell.debian.org - raff.debian.org + - ravel.debian.org - ries.debian.org - rietz.debian.org - spohr.debian.org + - valente.debian.org + - widor.debian.org apache2_security_mirror: - gluck.debian.org - kassia.debian.org @@ -150,8 +157,10 @@ host_settings: bartok.debian.org: mailout.debian.org brahms.debian.org: mailout.debian.org caballero.debian.org: mailout.debian.org + carver.debian.org: mailout.debian.org crest.debian.org: mailout.debian.org dijkstra.debian.org: mailout.debian.org + duarte.debian.org: mailout.debian.org escher.debian.org: mailout.debian.org fano.debian.org: mailout.debian.org finzi.debian.org: mailout.debian.org @@ -172,11 +181,14 @@ host_settings: malo.debian.org: mailout.debian.org mayer.debian.org: mailout.debian.org mayr.debian.org: mailout.debian.org + mendes.debian.org: mailout.debian.org merulo.debian.org: mailout.debian.org + monteverdi.debian.org: mailout.debian.org morales.debian.org: mailout.debian.org mundy.debian.org: mailout.debian.org murphy.debian.org: mailout.debian.org paer.debian.org: mailout.debian.org + paganini.debian.org: mailout.debian.org penalosa.debian.org: mailout.debian.org pergolesi.debian.org: mailout.debian.org peri.debian.org: mailout.debian.org @@ -185,6 +197,7 @@ host_settings: praetorius.debian.org: mailout.debian.org puccini.debian.org: mailout.debian.org rem.debian.org: mailout.debian.org + respighi.debian.org: mailout.debian.org rore.debian.org: mailout.debian.org saens.debian.org: mailout.debian.org schein.debian.org: mailout.debian.org @@ -196,11 +209,14 @@ host_settings: soler.debian.org: mailout.debian.org sperger.debian.org: mailout.debian.org spontini.debian.org: mailout.debian.org + stabile.debian.org: mailout.debian.org steffani.debian.org: mailout.debian.org unger.debian.org: mailout.debian.org villa.debian.org: mailout.debian.org + vivaldi.debian.org: mailout.debian.org voltaire.debian.org: mailout.debian.org wieck.debian.org: mailout.debian.org + wolkenstein.debian.org: mailout.debian.org zee.debian.org: mailout.debian.org zelenka.debian.org: mailout.debian.org mail_port: diff --git a/modules/exim/files/common/host_blacklist b/modules/exim/files/common/host_blacklist index a59ce8274..1f1d6284f 100644 --- a/modules/exim/files/common/host_blacklist +++ b/modules/exim/files/common/host_blacklist @@ -4,4 +4,6 @@ ## 193.146.156.252 112.78.115.101 +198.143.4.176 +64.255.101.196 *.bp06.net diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones index a7874dd33..066f9d540 100644 --- a/modules/named/files/common/named.conf.debian-zones +++ b/modules/named/files/common/named.conf.debian-zones @@ -5,8 +5,6 @@ // Slave domains, includ in bind.conf -// NOT USED YET - SYNC UP WITH dsa-misc/config/bind/ before enabling finally - zone "debian.org" { type slave; notify no; @@ -103,6 +101,31 @@ zone "2.0.0.0.2.0.0.0.8.5.8.0.1.0.0.2.ip6.arpa" { allow-transfer { }; }; +// debian rack with grnet +zone "192/27.211.177.194.in-addr.arpa" { + type slave; + notify no; + file "db.194.177.211.192"; + masters { + 82.195.75.106; // draghi + 2001:41b8:202:deb:216:36ff:fe40:3906; //draghi + }; + allow-query { any; }; + allow-transfer { }; +}; +zone "b.e.d.0.c.f.f.2.8.4.6.0.1.0.0.2.ip6.arpa" { + type slave; + notify no; + file "db.2001:0648:2ffc:0deb"; + masters { + 82.195.75.106; // draghi + 2001:41b8:202:deb:216:36ff:fe40:3906; //draghi + }; + allow-query { any; }; + allow-transfer { }; +}; + + // ipv6 at 1&1 - powell: 2001:08d8:0081:1520::/60 zone "2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa" { type slave; diff --git a/modules/named/manifests/secondary.pp b/modules/named/manifests/secondary.pp index b9615a627..003f1fe4f 100644 --- a/modules/named/manifests/secondary.pp +++ b/modules/named/manifests/secondary.pp @@ -1,8 +1,8 @@ class named::secondary inherits named { -# file { "/etc/bind/named.conf.debian-zones": -# source => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones", -# "puppet:///named/common/named.conf.debian-zones" ], -# notify => Exec["bind9 reload"], -# } + file { "/etc/bind/named.conf.debian-zones": + source => [ "puppet:///named/per-host/$fqdn/named.conf.debian-zones", + "puppet:///named/common/named.conf.debian-zones" ], + notify => Exec["bind9 reload"], + } } diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index c9b0fc652..6c35f144b 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -361,6 +361,8 @@ file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg" when "handel.debian.org": extrafiles="dir=8/etc/puppet" when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm" when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns" +when /(raff|rietz|klecker).debian.org/: extrafiles="dir=1/etc/bind +file=/etc/bind/named.conf.debian-zones" end extrafiles %>