aboutsummaryrefslogtreecommitdiffstats
path: root/modules/bind
diff options
context:
space:
mode:
Diffstat (limited to 'modules/bind')
-rw-r--r--modules/bind/manifests/init.pp75
-rw-r--r--modules/bind/manifests/master.pp17
-rw-r--r--modules/bind/manifests/slave.pp6
-rw-r--r--modules/bind/manifests/zone.pp13
-rw-r--r--modules/bind/manifests/zone/master.pp6
-rw-r--r--modules/bind/manifests/zone/reverse.pp6
-rw-r--r--modules/bind/templates/named_base.conf21
-rw-r--r--modules/bind/templates/named_slave.conf8
8 files changed, 74 insertions, 78 deletions
diff --git a/modules/bind/manifests/init.pp b/modules/bind/manifests/init.pp
index 230c50d1..a5d20c09 100644
--- a/modules/bind/manifests/init.pp
+++ b/modules/bind/manifests/init.pp
@@ -1,70 +1,25 @@
class bind {
- class bind_base {
- package { bind: }
+ package { 'bind': }
- service { named:
- restart => "service named restart",
- subscribe => Package["bind"],
- }
-
- file { '/etc/named.conf':
- ensure => "/var/lib/named/etc/named.conf",
- require => Package[bind],
- }
-
- exec { "named_reload":
- command => "service named reload",
- refreshonly => true,
- }
-
- file { '/var/lib/named/etc/named.conf':
- require => Package["bind"],
- content => "",
- notify => Service['named'],
- }
- }
-
- define zone_base($content = false) {
- if ! $content {
- $zone_content = template("bind/zones/$name.zone")
- } else {
- $zone_content = $content
- }
- file { "/var/lib/named/var/named/$zone_subdir/$name.zone":
- content => $zone_content,
- require => Package[bind],
- notify => Exec[named_reload]
- }
+ service { 'named':
+ restart => 'service named restart',
+ subscribe => Package['bind'],
}
- define zone_master($content = false) {
- $zone_subdir = "master"
- zone_base { $name :
- content => $content
- }
+ file { '/etc/named.conf':
+ ensure => link,
+ target => '/var/lib/named/etc/named.conf',
+ require => Package['bind'],
}
- define zone_reverse($content = false) {
- $zone_subdir = "reverse"
- zone_base { $name :
- content => $content
- }
- }
-
-
- class bind_master inherits bind_base {
- Tld_redirections::Domain <<| |>>
-
- $managed_tlds = list_exported_ressources('Tld_redirections::Domain')
- File['/var/lib/named/etc/named.conf'] {
- content => template("bind/named_base.conf", "bind/named_master.conf"),
- }
+ exec { 'named_reload':
+ command => 'service named reload',
+ refreshonly => true,
}
- class bind_slave inherits bind_base {
- $managed_tlds = list_exported_ressources('Tld_redirections::Domain')
- File['/var/lib/named/etc/named.conf'] {
- content => template("bind/named_base.conf", "bind/named_slave.conf"),
- }
+ file { '/var/lib/named/etc/named.conf':
+ require => Package['bind'],
+ content => '',
+ notify => Service['named'],
}
}
diff --git a/modules/bind/manifests/master.pp b/modules/bind/manifests/master.pp
new file mode 100644
index 00000000..a82d4757
--- /dev/null
+++ b/modules/bind/manifests/master.pp
@@ -0,0 +1,17 @@
+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/slave.pp b/modules/bind/manifests/slave.pp
new file mode 100644
index 00000000..e446b57a
--- /dev/null
+++ b/modules/bind/manifests/slave.pp
@@ -0,0 +1,6 @@
+class bind::slave inherits bind {
+ $managed_tlds = list_exported_ressources('Tld_redirections::Domain')
+ File['/var/lib/named/etc/named.conf'] {
+ content => template('bind/named_base.conf', 'bind/named_slave.conf'),
+ }
+}
diff --git a/modules/bind/manifests/zone.pp b/modules/bind/manifests/zone.pp
new file mode 100644
index 00000000..17f2075e
--- /dev/null
+++ b/modules/bind/manifests/zone.pp
@@ -0,0 +1,13 @@
+define bind::zone($type, $content = false) {
+ if ! $content {
+ $zone_content = template("bind/zones/${name}.zone")
+ } else {
+ $zone_content = $content
+ }
+
+ file { "/var/named/${type}/${name}.zone":
+ content => $zone_content,
+ require => Package['bind'],
+ notify => Exec['named_reload']
+ }
+}
diff --git a/modules/bind/manifests/zone/master.pp b/modules/bind/manifests/zone/master.pp
new file mode 100644
index 00000000..460f52c6
--- /dev/null
+++ b/modules/bind/manifests/zone/master.pp
@@ -0,0 +1,6 @@
+define bind::zone::master($content = false) {
+ bind::zone { $name :
+ type => 'master',
+ content => $content,
+ }
+}
diff --git a/modules/bind/manifests/zone/reverse.pp b/modules/bind/manifests/zone/reverse.pp
new file mode 100644
index 00000000..400e77f9
--- /dev/null
+++ b/modules/bind/manifests/zone/reverse.pp
@@ -0,0 +1,6 @@
+define bind::zone::reverse($content = false) {
+ bind::zone { $name :
+ type => 'reverse',
+ content => $content,
+ }
+}
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; };
};
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-24 04:52:45 +0000