From 627423c71c2bcaf83c563fdf4cbfa536f74de683 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Wallin Date: Sun, 17 Dec 2017 19:50:27 +0200 Subject: [PATCH 1/5] Remove extra variable def --- manifests/server/conf.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/server/conf.pp b/manifests/server/conf.pp index cef9aa068..a137f8820 100644 --- a/manifests/server/conf.pp +++ b/manifests/server/conf.pp @@ -158,7 +158,6 @@ $dnssec_validation = 'auto', $dnssec_lookaside = undef, $hostname = 'none', - $server_id = undef, $zones = {}, $keys = {}, $includes = [], From 7cdd3eaf1ddaec3a4ea8f2c921b5d8cb322c7830 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Wallin Date: Sun, 17 Dec 2017 19:51:11 +0200 Subject: [PATCH 2/5] Update conf.pp --- manifests/server/conf.pp | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/server/conf.pp b/manifests/server/conf.pp index a137f8820..a19f2aa46 100644 --- a/manifests/server/conf.pp +++ b/manifests/server/conf.pp @@ -157,7 +157,6 @@ $dnssec_enable = 'yes', $dnssec_validation = 'auto', $dnssec_lookaside = undef, - $hostname = 'none', $zones = {}, $keys = {}, $includes = [], From 22e1b95af98b045ee8ee596774ee89d857607385 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Wallin Date: Sun, 17 Dec 2017 19:54:28 +0200 Subject: [PATCH 3/5] duplicate remove --- manifests/server/file.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/server/file.pp b/manifests/server/file.pp index f8c8998de..f738b4242 100644 --- a/manifests/server/file.pp +++ b/manifests/server/file.pp @@ -30,7 +30,7 @@ # define bind::server::file ( $zonedir = $::bind::params::directory, - $zonedir = $::bind::params::zonedir, +# $zonedir = $::bind::params::zonedir, $owner = 'root', $group = $::bind::params::bindgroup, $mode = '0640', From dee5e47839592cb3c65cade1bb14568e1c9840ff Mon Sep 17 00:00:00 2001 From: Olli-Pekka Wallin Date: Sun, 17 Dec 2017 19:56:07 +0200 Subject: [PATCH 4/5] changeed commented row --- manifests/server/file.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/server/file.pp b/manifests/server/file.pp index f738b4242..7bb05ef5c 100644 --- a/manifests/server/file.pp +++ b/manifests/server/file.pp @@ -29,8 +29,8 @@ # } # define bind::server::file ( - $zonedir = $::bind::params::directory, -# $zonedir = $::bind::params::zonedir, +# $zonedir = $::bind::params::directory, + $zonedir = $::bind::params::zonedir, $owner = 'root', $group = $::bind::params::bindgroup, $mode = '0640', From c5cd373b65a9416efd09d9282e45725433fd7ab5 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Wallin Date: Sun, 17 Dec 2017 20:03:55 +0200 Subject: [PATCH 5/5] Update file.pp --- manifests/server/file.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/server/file.pp b/manifests/server/file.pp index 7bb05ef5c..a2d03a210 100644 --- a/manifests/server/file.pp +++ b/manifests/server/file.pp @@ -29,8 +29,7 @@ # } # define bind::server::file ( -# $zonedir = $::bind::params::directory, - $zonedir = $::bind::params::zonedir, + $zonedir = $::bind::params::directory, $owner = 'root', $group = $::bind::params::bindgroup, $mode = '0640',