Stop managing services.d dir in /opt/puppetlabs

This directory is ensured by the puppetserver package and since puppetserver 2.5 the directory that users are supposed to use is in /etc. This code appears tom be a leftover from when the code supported both < 2.5 and >= 2.5 in 68c2d50.
theforeman · Mar 24, 2023 · 87500e4 · 87500e4
1 parent 7bb1178
commit 87500e4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/manifests/server/puppetserver.pp b/manifests/server/puppetserver.pp
@@ -237,15 +237,6 @@
     content => template('puppet/server/puppetserver/services.d/ca.cfg.erb'),
   }
 
-  unless $facts['os']['family'] == 'FreeBSD' {
-    file { '/opt/puppetlabs/server/apps/puppetserver/config':
-      ensure => directory,
-    }
-    file { '/opt/puppetlabs/server/apps/puppetserver/config/services.d':
-      ensure => directory,
-    }
-  }
-
   file { "${server_puppetserver_dir}/conf.d/ca.conf":
     ensure  => file,
     content => template('puppet/server/puppetserver/conf.d/ca.conf.erb'),

diff --git a/spec/classes/puppet_server_puppetserver_spec.rb b/spec/classes/puppet_server_puppetserver_spec.rb
@@ -50,8 +50,6 @@
               .with_context('/files/etc/rc.conf')
           }
         else
-          it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config').with_ensure('directory') }
-          it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config/services.d').with_ensure('directory') }
           it {
             should contain_augeas('puppet::server::puppetserver::bootstrap')
               .with_changes('set BOOTSTRAP_CONFIG \'"/etc/custom/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"\'')