4 files changed, 18 insertions, 22 deletions
diff --git a/deployment/dns/manifests/init.pp b/deployment/dns/manifests/init.pp
index 0df8e2ad..a84c8db7 100644
--- a/deployment/dns/manifests/init.pp
+++ b/deployment/dns/manifests/init.pp
@@ -1,22 +1 @@
-
-class dns {
-    class server {
-        include bind::bind_master
-        dns::zone { "mageia.org": }
-
-        dns::reverse_zone { "7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa": }
-        dns::reverse_zone { "2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa": }
-    }
-
-    define zone {
-        bind::zone_master { $name:
-            content => template("dns/$name.zone")
-        }        
-    }
-
-    define reverse_zone {
-        bind::zone_reverse { $name:
-            content => template("dns/$name.zone")
-        }
-    }
-}
+class dns { }
diff --git a/deployment/dns/manifests/reverse_zone.pp b/deployment/dns/manifests/reverse_zone.pp
new file mode 100644
index 00000000..9095251d
--- /dev/null
+++ b/deployment/dns/manifests/reverse_zone.pp
@@ -0,0 +1,5 @@
+define dns::reverse_zone {
+    bind::zone::reverse { $name:
+        content => template("dns/${name}.zone")
+    }
+}
diff --git a/deployment/dns/manifests/server.pp b/deployment/dns/manifests/server.pp
new file mode 100644
index 00000000..c9467de8
--- /dev/null
+++ b/deployment/dns/manifests/server.pp
@@ -0,0 +1,7 @@
+class dns::server {
+    include bind::master
+    dns::zone { 'mageia.org': }
+
+    dns::reverse_zone { '7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa': }
+    dns::reverse_zone { '2.1.0.0.0.0.0.1.b.0.e.0.1.0.a.2.ip6.arpa': }
+}
diff --git a/deployment/dns/manifests/zone.pp b/deployment/dns/manifests/zone.pp
new file mode 100644
index 00000000..7d4da311
--- /dev/null
+++ b/deployment/dns/manifests/zone.pp
@@ -0,0 +1,5 @@
+define dns::zone {
+    bind::zone::master { $name:
+        content => template("dns/${name}.zone")
+    }
+}