Merge pull request #1 from ajjahn/master

Merge updates
ajjahn · Oct 25, 2017 · a63db05 · a63db05
2 parents 71a7095 + 57946eb
commit a63db05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/manifests/server/config.pp b/manifests/server/config.pp
@@ -66,9 +66,9 @@
   }
 
   concat::fragment {'default-zones.header':
-    target => $dns::server::params::rfc1912_zones_cfg,
-    order  => '00',
-    source => "puppet:///modules/${module_name}/named.conf.default-zones",
+    target  => $dns::server::params::rfc1912_zones_cfg,
+    order   => '00',
+    content => template('dns/named.conf.default-zones.erb'),
   }
 
   include dns::server::default

diff --git a/manifests/server/params.pp b/manifests/server/params.pp
@@ -18,13 +18,10 @@
       $default_template   = 'default.debian.erb'
       $default_dnssec_enable     = true
       $default_dnssec_validation = 'auto'
-      case $::operatingsystemmajrelease {
-        '8': {
-          $necessary_packages = ['bind9']
-        }
-        default: {
-          $necessary_packages = [ 'bind9', 'dnssec-tools' ]
-        }
+      if versioncmp( $::operatingsystemmajrelease, '8' ) >= 0 {
+        $necessary_packages = ['bind9']
+      } else {
+        $necessary_packages = [ 'bind9', 'dnssec-tools' ]
       }
     }
     'RedHat': {

diff --git a/files/named.conf.default-zones → templates/named.conf.default-zones.erb b/files/named.conf.default-zones → templates/named.conf.default-zones.erb
@@ -2,29 +2,29 @@
 // prime the server with knowledge of the root servers
 zone "." {
 	type hint;
-	file "/etc/bind/db.root";
+	file "<%= @cfg_dir %>/db.root";
 };
 
 // be authoritative for the localhost forward and reverse zones, and for
 // broadcast zones as per RFC 1912
 
 zone "localhost" {
 	type master;
-	file "/etc/bind/db.local";
+	file "<%= @cfg_dir %>/db.local";
 };
 
 zone "127.in-addr.arpa" {
 	type master;
-	file "/etc/bind/db.127";
+	file "<%= @cfg_dir %>/db.127";
 };
 
 zone "0.in-addr.arpa" {
 	type master;
-	file "/etc/bind/db.0";
+	file "<%= @cfg_dir %>/db.0";
 };
 
 zone "255.in-addr.arpa" {
 	type master;
-	file "/etc/bind/db.255";
+	file "<%= @cfg_dir %>/db.255";
 };