move dns zone to a module in deployment

6 files changed, 25 insertions, 8 deletions

diff --git a/deployment/dns/manifests/init.pp b/deployment/dns/manifests/init.pp
new file mode 100644
index 00000000..81abea49
--- /dev/null
+++ b/deployment/dns/manifests/init.pp
@@ -0,0 +1,22 @@
+
+class dns {
+    class server {
+        include bind::bind_master
+        dns::zone { "mageia.org": }
+        dns::zone { "mageia.fr": } 
+
+        dns::reverse_zone { "7.0.0.0.2.0.0.0.8.7.1.2.2.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")
+        }
+    }
+}
diff --git a/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone b/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone
index 85ec2902..85ec2902 100644
--- a/modules/bind/templates/zones/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone
+++ b/deployment/dns/templates/7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa.zone
diff --git a/modules/bind/templates/zones/mageia.fr.zone b/deployment/dns/templates/mageia.fr.zone
index 70ecc840..70ecc840 100644
--- a/modules/bind/templates/zones/mageia.fr.zone
+++ b/deployment/dns/templates/mageia.fr.zone
diff --git a/modules/bind/templates/zones/mageia.org.zone b/deployment/dns/templates/mageia.org.zone
index c6fb6f31..c6fb6f31 100644
--- a/modules/bind/templates/zones/mageia.org.zone
+++ b/deployment/dns/templates/mageia.org.zone
diff --git a/manifests/common.pp b/manifests/common.pp
index a4c6c796..50c0f219 100644
--- a/manifests/common.pp
+++ b/manifests/common.pp
@@ -109,9 +109,4 @@ class default_mageia_server inherits default_mageia_server_no_smtp {
 #    include ssmtp
 }
 
-class dns_server {
-    include bind::bind_master
-    bind::zone_master { "mageia.org": }
-    bind::zone_master { "mageia.fr": } 
-    bind::zone_reverse { "7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa": }
-}
+
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index 9e2388e4..1850081e 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -49,7 +49,6 @@ node alamut {
 # 
     include default_mageia_server_no_smtp
     include postgresql::server
-    include dns_server 
     timezone::timezone { "Europe/Paris": }
 
     include catdap
@@ -62,6 +61,7 @@ node alamut {
     include postfix::primary_smtp
   
     include lists
+    include dns::server 
 }
 
 # buildnode
@@ -108,7 +108,7 @@ node krampouezh {
     #include default_mageia_server_no_smtp
     #include postfix::secondary_smtp
 
-    include dns_server 
+    include dns::server 
     timezone::timezone { "Europe/Paris": }
 # Other services running on this server :
 # - meetbot