aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/common.pp6
-rw-r--r--manifests/nodes.pp9
2 files changed, 8 insertions, 7 deletions
diff --git a/manifests/common.pp b/manifests/common.pp
index df9033c9..049ffd35 100644
--- a/manifests/common.pp
+++ b/manifests/common.pp
@@ -96,3 +96,9 @@ class default_mageia_server {
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": }
+}
diff --git a/manifests/nodes.pp b/manifests/nodes.pp
index be7d873a..9578fa03 100644
--- a/manifests/nodes.pp
+++ b/manifests/nodes.pp
@@ -47,9 +47,7 @@ node alamut {
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 @@ node krampouezh {
# - 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