Skip to content

Commit a3fb371

Browse files
committed
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.
1 parent 7bb1178 commit a3fb371

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

manifests/server/puppetserver.pp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -237,15 +237,6 @@
237237
content => template('puppet/server/puppetserver/services.d/ca.cfg.erb'),
238238
}
239239

240-
unless $facts['os']['family'] == 'FreeBSD' {
241-
file { '/opt/puppetlabs/server/apps/puppetserver/config':
242-
ensure => directory,
243-
}
244-
file { '/opt/puppetlabs/server/apps/puppetserver/config/services.d':
245-
ensure => directory,
246-
}
247-
}
248-
249240
file { "${server_puppetserver_dir}/conf.d/ca.conf":
250241
ensure => file,
251242
content => template('puppet/server/puppetserver/conf.d/ca.conf.erb'),

spec/classes/puppet_server_puppetserver_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
.with_context('/files/etc/rc.conf')
5151
}
5252
else
53-
it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config').with_ensure('directory') }
54-
it { should contain_file('/opt/puppetlabs/server/apps/puppetserver/config/services.d').with_ensure('directory') }
5553
it {
5654
should contain_augeas('puppet::server::puppetserver::bootstrap')
5755
.with_changes('set BOOTSTRAP_CONFIG \'"/etc/custom/puppetserver/services.d/,/opt/puppetlabs/server/apps/puppetserver/config/services.d/"\'')

0 commit comments

Comments
 (0)