Always set root as dir owner

This was already true for AIO packages, but at least in Debian 10 and Fedora 33's non-AIO packages this is also true.
theforeman · Jul 23, 2021 · f17899d · f17899d
1 parent 9a7016a
commit f17899d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -176,12 +176,9 @@
   if $facts['os']['family'] == 'Windows' {
     $dir_owner = undef
     $dir_group = undef
-  } elsif $aio_package or $facts['os']['family'] == 'Suse' {
+  } else {
     $dir_owner = 'root'
     $dir_group = $root_group
-  } else {
-    $dir_owner = $user
-    $dir_group = $group
   }
 
   $package_provider = $facts['os']['family'] ? {

diff --git a/spec/classes/puppet_config_spec.rb b/spec/classes/puppet_config_spec.rb
@@ -5,8 +5,8 @@
     context "on #{os}" do
       case os_facts[:osfamily]
       when 'FreeBSD'
-        dir_owner = 'puppet'
-        dir_group = 'puppet'
+        dir_owner = 'root'
+        dir_group = nil
         confdir   = '/usr/local/etc/puppet'
         logdir    = '/var/log/puppet'
         rundir    = '/var/run/puppet'
@@ -21,8 +21,8 @@
         ssldir    = 'C:/ProgramData/PuppetLabs/puppet/etc/ssl'
         vardir    = 'C:/ProgramData/PuppetLabs/puppet/var'
       when 'Archlinux'
-        dir_owner = 'puppet'
-        dir_group = 'puppet'
+        dir_owner = 'root'
+        dir_group = nil
         confdir   = '/etc/puppetlabs/puppet'
         logdir    = '/var/log/puppetlabs/puppet'
         rundir    = '/var/run/puppetlabs'