[Mageia-sysadm] [493] factorization of the dns server class ( since we use puppet to

[root at mageia.org]

Revision: 493
Author:   misc
Date:     2010-12-01 21:15:19 +0100 (Wed, 01 Dec 2010)
Log Message:
-----------
factorization of the dns server class ( since we use puppet to
setup 2 master instead of using 1 master and 1 slave )

Modified Paths:
--------------
    puppet/manifests/common.pp
    puppet/manifests/nodes.pp

Modified: puppet/manifests/common.pp
===================================================================
--- puppet/manifests/common.pp	2010-12-01 20:06:54 UTC (rev 492)
+++ puppet/manifests/common.pp	2010-12-01 20:15:19 UTC (rev 493)
@@ -96,3 +96,9 @@
     include puppet::client
 }
 
+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": }
+}

Modified: puppet/manifests/nodes.pp
===================================================================
--- puppet/manifests/nodes.pp	2010-12-01 20:06:54 UTC (rev 492)
+++ puppet/manifests/nodes.pp	2010-12-01 20:15:19 UTC (rev 493)
@@ -47,9 +47,7 @@
     include default_mageia_server
     include bind::bind_master
     include postgresql
-    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": }
+    include dns_server 
     timezone::timezone { "Europe/Paris": }
 
     include catdap
@@ -100,10 +98,7 @@
 # - LDAP slave (for external traffic maybe)
 #
     include default_mageia_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": }
+    include dns_server 
     timezone::timezone { "Europe/Paris": }
 # Other services running on this server :
 # - meetbot
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101201/4135cf75/attachment-0001.html>