Merge pull request 'feat: puppetserver dropins' (#36) from neoloc/puppetmaster_restart_fixes into develop
Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/36
This commit is contained in:
commit
dd82d63b41
@ -43,12 +43,15 @@ class profiles::puppet::puppetca (
|
||||
source => '/etc/puppetlabs/puppet/ssl/crl.pem.latest',
|
||||
require => File['/etc/puppetlabs/puppet/ssl/crl.pem.latest'],
|
||||
}
|
||||
# add a execstartpost to the puppetserver.service
|
||||
# copy the latest crl when restarting
|
||||
systemd::manage_dropin { 'copy_crl.conf':
|
||||
ensure => present,
|
||||
unit => 'puppetserver.service',
|
||||
service_entry => {
|
||||
'ExecStartPost' => '/usr/bin/sleep 2; /bin/cp /etc/puppetlabs/puppet/ssl/crl.pem.latest /etc/puppetlabs/puppet/ssl/crl.pem',
|
||||
'ExecStartPost' => [
|
||||
'/usr/bin/sleep 2',
|
||||
'/bin/cp /etc/puppetlabs/puppet/ssl/crl.pem.latest /etc/puppetlabs/puppet/ssl/crl.pem',
|
||||
],
|
||||
},
|
||||
require => File['/etc/puppetlabs/puppet/ssl/crl.pem'],
|
||||
}
|
||||
|
||||
@ -71,4 +71,14 @@ class profiles::puppet::server (
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
}
|
||||
# generate puppet types when restarting
|
||||
systemd::manage_dropin { 'generate_types.conf':
|
||||
ensure => present,
|
||||
unit => 'puppetserver.service',
|
||||
service_entry => {
|
||||
'ExecStartPost' => [
|
||||
"/opt/puppetlabs/bin/puppet generate types --environmentpath ${codedir}/environments",
|
||||
],
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user