From 87500e43c903004f9fd19863722900edd9c31e90 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 24 Mar 2023 15:54:21 +0100 Subject: [PATCH] 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 68c2d50eac54de1e21e66a96794eca1d1d51f8af. --- manifests/server/puppetserver.pp | 9 --------- spec/classes/puppet_server_puppetserver_spec.rb | 2 -- 2 files changed, 11 deletions(-) diff --git a/manifests/server/puppetserver.pp b/manifests/server/puppetserver.pp index a9475648..c2981565 100644 --- 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 index dda94c1d..845a444a 100644 --- 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/"\'')