add popov.debian.org Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/modules/debian-org/misc/hoster.yaml b/modules/debian-org/misc/hoster.yaml
index ad9f878..49752c0 100644 (file)
--- a/modules/debian-org/misc/hoster.yaml
+++ b/modules/debian-org/misc/hoster.yaml
@@ -111,7 +111,10 @@ uni-karlsruhe:
     - 2001:41b8:202:deb::/64
   searchpaths: [debprivate-darmstadt.debian.org]
   nameservers: [82.195.66.249, 217.198.242.225]
-# add marist
+marist:
+  netrange:
+    - 148.100.96.0/25
+  nameservers: []
 osuosl:
   netrange:
     - 140.211.166.0/25

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 71122df..3fe1b12 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -64,6 +64,7 @@ nameinfo:
   lamb.debian.org: John David Lamb (b. 1935)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
+  lilburn.debian.org: Douglas Gordon Lilburn (November 2nd, 1915 - June 6th, 2001)
   lindberg.debian.org: Magnus Lindberg (June 27th, 1958)
   liszt.debian.org: Franz Liszt (October 22nd, 1811 - July 31st, 1886)
   locke.debian.org: Matthew Locke (ca. 1621 - 1677)
@@ -128,7 +129,6 @@ nameinfo:
   tristano.debian.org: Gerardo Tristano (July 1st, 1955 - ongoing)
   tye.debian.org: Christopher Tye (c.1505 - 1573)
   unger.debian.org: Caroline Unger (October 28th, 1803 - March 23th, 1877)
-  valente.debian.org: Vincenzo Valente (February 21st, 1855 - September 6th, 1921)
   vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
   vivaldi.debian.org: Antonio Lucio Vivaldi (March 4th, 1678 - July 28th, 1741)
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21st, 1844 - March 12th, 1937)
@@ -181,7 +181,6 @@ host_settings:
     - ravel.debian.org
     - reger.debian.org
     - spohr.debian.org
-    - valente.debian.org
   apache2_security_mirror:
     - gluck.debian.org
     - lobos.debian.org
@@ -281,126 +280,6 @@ host_settings:
     - zandonai.debian.org
     - zappa.debian.org
     - zemlinsky.debian.org
-  #wheezy:
-  #  - harris.debian.org
-  #  - hartmann.debian.org
-  #  - hasse.debian.org
-  #  - hebden.debian.org
-  #  - henze.debian.org
-  #  - hoiby.debian.org
-  #squeeze:
-  #  - abel.debian.org
-  #  - agricola.debian.org
-  #  - alain.debian.org
-  #  - alkman.debian.org
-  #  - alwyn.debian.org
-  #  - antheil.debian.org
-  #  - arcadelt.debian.org
-  #  - argento.debian.org
-  #  - arne.debian.org
-  #  - arnold.debian.org
-  #  - ball.debian.org
-  #  - barber.debian.org
-  #  - beethoven.debian.org
-  #  - bellini.debian.org
-  #  - berlioz.debian.org
-  #  - biber.debian.org
-  #  - brahms.debian.org
-  #  - busoni.debian.org
-  #  - caballero.debian.org
-  #  - chopin.debian.org
-  #  - cilea.debian.org
-  #  - danzi.debian.org
-  #  - diamond.debian.org
-  #  - dijkstra.debian.org
-  #  - draghi.debian.org
-  #  - duarte.debian.org
-  #  - dukas.debian.org
-  #  - eder.debian.org
-  #  - elgar.debian.org
-  #  - englund.debian.org
-  #  - eysler.debian.org
-  #  - fano.debian.org
-  #  - fasch.debian.org
-  #  - field.debian.org
-  #  - finzi.debian.org
-  #  - franck.debian.org
-  #  - geo1.debian.org
-  #  - geo2.debian.org
-  #  - geo3.debian.org
-  #  - glinka.debian.org
-  #  - gluck.debian.org
-  #  - gombert.debian.org
-  #  - grieg.debian.org
-  #  - handel.debian.org
-  #  - heininen.debian.org
-  #  - holter.debian.org
-  #  - jenkins.debian.org
-  #  - kassia.debian.org
-  #  - kaufmann.debian.org
-  #  - kokkonen.debian.org
-  #  - krenek.debian.org
-  #  - lamb.debian.org
-  #  - lebrun.debian.org
-  #  - lindberg.debian.org
-  #  - lobos.debian.org
-  #  - locke.debian.org
-  #  - lotti.debian.org
-  #  - luchesi.debian.org
-  #  - master.debian.org
-  #  - merikanto.debian.org
-  #  - merulo.debian.org
-  #  - morricone.debian.org
-  #  - mundy.debian.org
-  #  - murphy.debian.org
-  #  - nono.debian.org
-  #  - orff.debian.org
-  #  - paganini.debian.org
-  #  - pergolesi.debian.org
-  #  - pettersson.debian.org
-  #  - piatti.debian.org
-  #  - porpora.debian.org
-  #  - poulenc.debian.org
-  #  - praetorius.debian.org
-  #  - quantz.debian.org
-  #  - rautavaara.debian.org
-  #  - ravel.debian.org
-  #  - reger.debian.org
-  #  - rem.debian.org
-  #  - respighi.debian.org
-  #  - ries.debian.org
-  #  - rietz.debian.org
-  #  - rore.debian.org
-  #  - rossini.debian.org
-  #  - saens.debian.org
-  #  - salieri.debian.org
-  #  - samosa.debian.org
-  #  - santoro.debian.org
-  #  - scelsi.debian.org
-  #  - schein.debian.org
-  #  - schroeder.debian.org
-  #  - schumann.debian.org
-  #  - senfl.debian.org
-  #  - sibelius.debian.org
-  #  - smetana.debian.org
-  #  - soler.debian.org
-  #  - sperger.debian.org
-  #  - spohr.debian.org
-  #  - spontini.debian.org
-  #  - stabile.debian.org
-  #  - steffani.debian.org
-  #  - tchaikovsky.debian.org
-  #  - traetta.debian.org
-  #  - tye.debian.org
-  #  - unger.debian.org
-  #  - villa.debian.org
-  #  - vitry.debian.org
-  #  - vivaldi.debian.org
-  #  - widor.debian.org
-  #  - wieck.debian.org
-  #  - wolkenstein.debian.org
-  #  - zandonai.debian.org
-  #  - zelenka.debian.org
   smarthost:
     abel.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org
@@ -467,6 +346,7 @@ host_settings:
     lamb.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
     leisner.debian.org: mailout.debian.org
+    lilburn.debian.org: mailout.debian.org
     lindberg.debian.org: mailout.debian.org
     lobos.debian.org: mailout.debian.org
     locke.debian.org: mailout.debian.org

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
index 3101920..af8fcb9 100644 (file)
--- a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
@@ -3,8 +3,6 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if lsbdistcodename == 'lenny' %>
-deb     http://volatile.debian.org/debian-volatile lenny/volatile   main contrib non-free
-<% elsif lsbdistcodename != 'n/a' %>
+<% unless %w{lenny n/a}.include?(scope.lookupvar('::lsbdistcodename')) %>
 deb    http://ftp.debian.org/debian    <%= lsbdistcodename %>-updates          main contrib non-free
 <% end %>

diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones
index 32ce19f..0dd0b1f 100644 (file)
--- a/modules/named/files/common/named.conf.debian-zones
+++ b/modules/named/files/common/named.conf.debian-zones
@@ -132,20 +132,6 @@ zone "2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa" {
        allow-query { any; };
        allow-transfer { };
 };
-// ipv6 at 1&1 - puccini 2001:08d8:0081:15a0::/60
-zone "a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa" {
-       type slave;
-       notify no;
-       file "db.2001:08d8:0081:15a0";
-       masters {
-               194.177.211.209; // orff
-               2001:648:2ffc:deb:213:72ff:fe69:e188; // orff
-               82.195.75.106; // draghi (backup master - requires manual reconfiguration on draghi)
-               2001:41b8:202:deb:216:36ff:fe40:3906; // draghi (see above
-       };
-       allow-query { any; };
-       allow-transfer { };
-};
 // ipv6 at 1&1 - wieck and schumann  - old range April 2011
 zone "2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa" {
        type slave;
@@ -175,21 +161,6 @@ zone "2.6.a.0.4.6.5.6.0.0.4.0.0.8.5.0.8.d.8.0.1.0.0.2.ip6.arpa" {
        allow-transfer { };
 };
 
-// ipv6 at xs4all - klecker 2001:888:2000:12::/64
-//zone "2.1.0.0.0.0.0.2.8.8.8.0.1.0.0.2.ip6.arpa" {
-//     type slave;
-//     notify no;
-//     file "db.2001:888:2000:12";
-//     masters {
-//             194.177.211.209; // orff
-//             2001:648:2ffc:deb:213:72ff:fe69:e188; // orff
-//             82.195.75.106; // draghi (backup master - requires manual reconfiguration on draghi)
-//             2001:41b8:202:deb:216:36ff:fe40:3906; // draghi (see above
-//     };
-//     allow-query { any; };
-//     allow-transfer { };
-//};
-
 // 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC/ECE
 zone "19.12.206.in-addr.arpa" {
        type slave;

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 63512d5..2f73886 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -70,14 +70,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
@@ -154,14 +146,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
@@ -238,14 +222,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
@@ -322,14 +298,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
@@ -406,14 +374,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
@@ -490,14 +450,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
@@ -574,14 +526,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
@@ -658,14 +602,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
@@ -742,14 +678,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org";

diff --git a/modules/roles/files/www_mirror/www.debian.org b/modules/roles/files/www_mirror/www.debian.org
index c9b6048..2fd925e 100644 (file)
--- a/modules/roles/files/www_mirror/www.debian.org
+++ b/modules/roles/files/www_mirror/www.debian.org
@@ -215,3 +215,13 @@
    RewriteRule ^/doc/([^/]+)/?(.*)? /doc/manuals/$1/$2 [L,R=301]
 
 </VirtualHost>
+
+
+<VirtualHost *:80>
+   ServerName volatile.debian.org
+   ServerAlias volatile-master.debian.org
+   ServerAdmin webmaster@debian.org
+   ErrorLog /var/log/apache2/volatile.debian.org-error.log
+   CustomLog /var/log/apache2/volatile.debian.org-access.log combined
+   RedirectMatch permanent . http://www.debian.org/volatile/
+</VirtualHost>

diff --git a/modules/site/manifests/sysctl.pp b/modules/site/manifests/sysctl.pp
index ac357a7..49a6be4 100644 (file)
--- a/modules/site/manifests/sysctl.pp
+++ b/modules/site/manifests/sysctl.pp
@@ -6,13 +6,15 @@ define site::sysctl ($key, $value, $ensure = present) {
                default: { fail ( "Unknown ensure value: '$ensure'" ) }
        }
 
-       file {
-               "/etc/sysctl.d/${name}.conf":
-                       ensure  => $ensure,
-                       owner   => root,
-                       group   => root,
-                       mode    => '0644',
-                       content => "${key} = ${value}\n",
-                       notify  => Service['procps']
+       if $::kernel == 'Linux' {
+               file {
+                       "/etc/sysctl.d/${name}.conf":
+                               ensure  => $ensure,
+                               owner   => root,
+                               group   => root,
+                               mode    => '0644',
+                               content => "${key} = ${value}\n",
+                               notify  => Service['procps']
+               }
        }
 }

diff --git a/modules/stunnel4/manifests/init.pp b/modules/stunnel4/manifests/init.pp
index 300eb52..6d5c4e4 100644 (file)
--- a/modules/stunnel4/manifests/init.pp
+++ b/modules/stunnel4/manifests/init.pp
@@ -18,7 +18,7 @@ class stunnel4 {
        }
 
        exec { 'enable_stunnel4':
-               command => 'sed -i -e \'s/^ENABLED=/#&/; \$a ENABLED=1 # added by puppet\' /etc/default/stunnel4',
+               command => 'sed -i -e \'s/^ENABLED=/#&/; $a ENABLED=1 # added by puppet\' /etc/default/stunnel4',
                unless  => 'grep -q \'^ENABLED=1\' /etc/default/stunnel4',
                require => Package['stunnel4'],
        }