Skip to content

Commit 5c7cb63

Browse files
committed
Fix filemode of the zonefile directory
In CentOS/RHEL the directory is created with mode 0770, instead of 0750. Fixes: #288
1 parent 3a16fcb commit 5c7cb63

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

manifests/config.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
ensure => directory,
6262
owner => $dns::params::user,
6363
group => $dns::params::group,
64-
mode => '0750',
64+
mode => $dns::zonefilepath_mode,
6565
}
6666

6767
exec { 'create-rndc.key':

manifests/init.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
# Name of the service
3131
# @param zonefilepath
3232
# Directory containing zone files
33+
# @param zonefilepath_mode
34+
# Mode of the directory containing zone files
3335
# @param localzonepath
3436
# File holding local zones like RFC1912 or RFC1918 files. The special value
3537
# 'unmanaged' can be used if one plans to create custom RFC1912/RFC1918 zones
@@ -159,6 +161,7 @@
159161
Boolean $manage_service = true,
160162
String $namedservicename = $dns::params::namedservicename,
161163
Stdlib::Absolutepath $zonefilepath = $dns::params::zonefilepath,
164+
Stdlib::Filemode $zonefilepath_mode = $dns::params::zonefilepath_mode,
162165
Variant[Enum['unmanaged'], Stdlib::Absolutepath] $localzonepath = $dns::params::localzonepath,
163166
Variant[Enum['unmanaged'], Stdlib::Absolutepath] $defaultzonepath = $dns::params::defaultzonepath,
164167
Optional[Enum['only', 'first']] $forward = undef,

manifests/params.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
$vardir = '/var/cache/bind'
88
$optionspath = "${dnsdir}/named.conf.options"
99
$zonefilepath = "${vardir}/zones"
10+
$zonefilepath_mode = '0750'
1011
$localzonepath = $facts['os']['name'] ? {
1112
'Debian' => if versioncmp($facts['os']['release']['major'], '13') >= 0 { 'unmanaged' } else { "${dnsdir}/zones.rfc1918" },
1213
default => "${dnsdir}/zones.rfc1918",
@@ -41,6 +42,7 @@
4142
$vardir = '/var/named'
4243
$optionspath = '/etc/named/options.conf'
4344
$zonefilepath = "${vardir}/dynamic"
45+
$zonefilepath_mode = '0770'
4446
$localzonepath = "${dnsdir}/named.rfc1912.zones"
4547
$defaultzonepath = 'unmanaged'
4648
$publicviewpath = "${dnsdir}/named/zones.conf"
@@ -66,6 +68,7 @@
6668
$vardir = '/usr/local/etc/namedb/working'
6769
$optionspath = '/usr/local/etc/namedb/options.conf'
6870
$zonefilepath = "${dnsdir}/dynamic"
71+
$zonefilepath_mode = '0750'
6972
$localzonepath = 'unmanaged' # "${dnsdir}/master/empty.db"
7073
$defaultzonepath = 'unmanaged'
7174
$publicviewpath = "${dnsdir}/zones.conf"
@@ -89,6 +92,7 @@
8992
$vardir = '/var/named'
9093
$optionspath = "${dnsdir}/named.options.conf"
9194
$zonefilepath = "${vardir}/dynamic"
95+
$zonefilepath_mode = '0750'
9296
$localzonepath = 'unmanaged' # "${dnsdir}/named.local.conf"
9397
$defaultzonepath = 'unmanaged'
9498
$publicviewpath = "${dnsdir}/zones.conf"

spec/defines/dns_zone_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
should contain_file("#{zonefilepath}/db.example.com").with({
5454
:owner => user_name,
5555
:group => user_name,
56-
:mode => '0644',
56+
:mode => '0640',
5757
:replace => 'false',
5858
}).that_notifies('Class[Dns::Service]')
5959
end

0 commit comments

Comments
 (0)