Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / named / templates / named.conf.debian-zones.erb

diff --git a/modules/named/templates/named.conf.debian-zones.erb b/modules/named/templates/named.conf.debian-zones.erb
index 910735b..bb098d8 100644 (file)
--- a/modules/named/templates/named.conf.debian-zones.erb
+++ b/modules/named/templates/named.conf.debian-zones.erb
@@ -19,7 +19,6 @@ zones << "debian.gr"
 zones << "debian.us"
 zones << "debian.org.tw"
 
-zones << "debconf13.ch"
 zones << "debian-ports.org"
 
 # debian rack with sil.at
@@ -82,17 +81,3 @@ zone "<%= zone %>" {
 };
 
 <% end -%>
-
-
-
-zone "alioth.debian.org" {
-       type slave;
-       notify no;
-       file "db.alioth.debian.org";
-       masters {
-               5.153.231.21;
-       };
-       allow-query { any; };
-       allow-transfer { };
-};
-