CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [6.1.0](https://github.com/theforeman/puppet-dhcp/tree/6.1.0) (2020-09-22)
+
+[Full Changelog](https://github.com/theforeman/puppet-dhcp/compare/6.0.0...6.1.0)
+
+**Implemented enhancements:**
+
+- Adjust config directory mode to the system defaults [\#177](https://github.com/theforeman/puppet-dhcp/pull/177) ([ezr-ondrej](https://github.com/ezr-ondrej))
+
 ## [6.0.0](https://github.com/theforeman/puppet-dhcp/tree/6.0.0) (2020-05-12)
 
 [Full Changelog](https://github.com/theforeman/puppet-dhcp/compare/5.1.1...6.0.0)

manifests/init.pp

@@ -24,11 +24,14 @@
   String $logfacility = 'local7',
   Boolean $dhcp_monitor = true,
   Stdlib::Absolutepath $dhcp_dir = $dhcp::params::dhcp_dir,
+  Boolean $manage_dhcp_dir = $dhcp::params::manage_dhcp_dir,
+  Optional[Stdlib::Filemode] $conf_dir_mode = $dhcp::params::conf_dir_mode,
   String $packagename = $dhcp::params::packagename,
   String $servicename = $dhcp::params::servicename,
   $option_static_route = undef,
   Variant[Array[String], Optional[String]] $options = undef,
   Boolean $authoritative = false,
+  String $dhcp_root_user = 'root',
   String $dhcp_root_group = $dhcp::params::root_group,
   Boolean $ddns_updates = false,
   Optional[String] $ddns_domainname = undef,
@@ -71,9 +74,13 @@
     ensure   => installed,
   }
 
-  file { $dhcp_dir:
-    mode    => '0755',
-    require => Package[$packagename],
+  if $manage_dhcp_dir {
+    file { $dhcp_dir:
+      owner   => $dhcp_root_user,
+      group   => $dhcp_root_group,
+      mode    => $conf_dir_mode,
+      require => Package[$packagename],
+    }
   }
 
   # Only debian and ubuntu have this style of defaults for startup.
@@ -122,7 +129,7 @@
   }
 
   concat { "${dhcp_dir}/dhcpd.conf":
-    owner   => 'root',
+    owner   => $dhcp_root_user,
     group   => $dhcp_root_group,
     mode    => '0644',
     require => Package[$packagename],
@@ -144,7 +151,7 @@
   }
 
   concat { "${dhcp_dir}/dhcpd.hosts":
-    owner   => 'root',
+    owner   => $dhcp_root_user,
     group   => $dhcp_root_group,
     mode    => '0644',
     require => Package[$packagename],

manifests/params.pp

@@ -11,11 +11,13 @@
 
   case $facts['os']['family'] {
     'Debian': {
-      $dhcp_dir    = '/etc/dhcp'
+      $dhcp_dir = '/etc/dhcp'
+      $manage_dhcp_dir = true
+      $conf_dir_mode = '0755'
       $packagename = 'isc-dhcp-server'
       $servicename = 'isc-dhcp-server'
-      $root_group  = 'root'
-      $bootfiles   = {
+      $root_group = 'root'
+      $bootfiles = {
         '00:06' => 'grub2/bootia32.efi',
         '00:07' => 'grub2/bootx64.efi',
         '00:09' => 'grub2/bootx64.efi',
@@ -24,6 +26,8 @@
 
     /^(FreeBSD|DragonFly)$/: {
       $dhcp_dir    = '/usr/local/etc'
+      $manage_dhcp_dir = false
+      $conf_dir_mode = undef
       $packagename = 'isc-dhcp44-server'
       $servicename = 'isc-dhcpd'
       $root_group  = 'wheel'
@@ -32,6 +36,8 @@
 
     'Archlinux': {
       $dhcp_dir    = '/etc'
+      $manage_dhcp_dir = false
+      $conf_dir_mode = undef
       $packagename = 'dhcp'
       $servicename = 'dhcpd4'
       $root_group  = 'root'
@@ -40,6 +46,8 @@
 
     'RedHat': {
       $dhcp_dir    = '/etc/dhcp'
+      $manage_dhcp_dir = true
+      $conf_dir_mode = '0750'
       if versioncmp($facts['os']['release']['major'], '8') >= 0 {
         $packagename = 'dhcp-server'
       } else {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dhcp",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "author": "theforeman",
   "summary": "Manage the ISC DHCP daemon",
   "license": "Apache-2.0",