4 files changed, 23 insertions, 20 deletions
diff --git a/modules/bind/manifests/master.pp b/modules/bind/manifests/master.pp
index c5ea1ccc..a82d4757 100644
--- a/modules/bind/manifests/master.pp
+++ b/modules/bind/manifests/master.pp
@@ -2,6 +2,15 @@ class bind::master inherits bind {
     Tld_redirections::Domain <<| |>>
 
     $managed_tlds = list_exported_ressources('Tld_redirections::Domain')
+
+    file { "/var/lib/named/var/named/master":
+          ensure => directory
+      }
+
+    file { "/var/lib/named/var/named/reverse":
+          ensure => directory
+      }
+
     File['/var/lib/named/etc/named.conf'] {
         content => template('bind/named_base.conf', 'bind/named_master.conf'),
     }
diff --git a/modules/bind/manifests/zone.pp b/modules/bind/manifests/zone.pp
index 24367206..17f2075e 100644
--- a/modules/bind/manifests/zone.pp
+++ b/modules/bind/manifests/zone.pp
@@ -1,10 +1,11 @@
 define bind::zone($type, $content = false) {
     if ! $content {
-        $zone_content = template("bind/zones/$name.zone")
+        $zone_content = template("bind/zones/${name}.zone")
     } else {
         $zone_content = $content
     }
-    file { "/var/lib/named/var/named/$type/$name.zone":
+
+    file { "/var/named/${type}/${name}.zone":
         content => $zone_content,
         require => Package['bind'],
         notify  => Exec['named_reload']
diff --git a/modules/bind/templates/named_base.conf b/modules/bind/templates/named_base.conf
index c066f16a..5adba9f3 100644
--- a/modules/bind/templates/named_base.conf
+++ b/modules/bind/templates/named_base.conf
@@ -32,7 +32,6 @@ options {
     version "";
     directory "/var/named";
     dump-file "/var/tmp/named_dump.db";
-    pid-file "/var/run/named.pid";
     statistics-file "/var/tmp/named.stats";
     zone-statistics yes;
 //    datasize 256M;
@@ -101,37 +100,31 @@ zone "." IN {
 
 zone "localdomain" IN {
 	type master;
-	file "master/localdomain.zone";
+	file "named.localhost";
 	allow-update { none; };
 };
 
 zone "localhost" IN {
 	type master;
-	file "master/localhost.zone";
+	file "named.localhost";
 	allow-update { none; };
 };
 
-zone "0.0.127.in-addr.arpa" IN {
+zone "1.0.0.127.in-addr.arpa" IN {
 	type master;
-	file "reverse/named.local";
+	file "named.loopback";
 	allow-update { none; };
 };
 
-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN {
+zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa" IN {
         type master;
-	file "reverse/named.ip6.local";
-	allow-update { none; };
-};
-
-zone "255.in-addr.arpa" IN {
-	type master;
-	file "reverse/named.broadcast";
+	file "named.loopback";
 	allow-update { none; };
 };
 
 zone "0.in-addr.arpa" IN {
 	type master;
-	file "reverse/named.zero";
+	file "named.empty";
 	allow-update { none; };
 };
 
diff --git a/modules/bind/templates/named_slave.conf b/modules/bind/templates/named_slave.conf
index feae30ef..b59db37f 100644
--- a/modules/bind/templates/named_slave.conf
+++ b/modules/bind/templates/named_slave.conf
@@ -1,7 +1,7 @@
 zone "mageia.org" IN {
 	type slave;
 	file "slave/mageia.org";
-	allow-update { 212.85.158.146; };
+	allow-update { 212.85.158.151; };
 };
 
 <%
@@ -11,7 +11,7 @@ for tld in managed_tlds
 zone "mageia.<%= tld %>" IN {
 	type master;
 	file "master/mageia.<= tld %>";
-	allow-update { 212.85.158.146; };
+	allow-update { 212.85.158.151; };
 };
 
 <%
@@ -21,11 +21,11 @@ end
 zone "7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa" IN {
 	type slave;
 	file "slave/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone";
-	allow-update { 212.85.158.146; };
+	allow-update { 212.85.158.151; };
 };
 
 zone "2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa" IN {
 	type slave;
 	file "slave/2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa.zone";
-        allow-update { 212.85.158.146; };
+        allow-update { 212.85.158.151; };
 };