unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat: puppetserver dropins' (#36) from neoloc/puppetmaster_restart_fixes into develop

Browse Source 
Reviewed-on: https://git.query.consul/unkinben/puppet-prod/pulls/36
This commit is contained in:
Ben Vincent 2024-06-16 00:15:43 +10:00
commit dd82d63b41
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
site/profiles/manifests/puppet/puppetca.pp
View File

@ -43,12 +43,15 @@ class profiles::puppet::puppetca (
source => '/etc/puppetlabs/puppet/ssl/crl.pem.latest', source => '/etc/puppetlabs/puppet/ssl/crl.pem.latest',
require => File['/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': systemd::manage_dropin { 'copy_crl.conf':
ensure => present, ensure => present,
unit => 'puppetserver.service', unit => 'puppetserver.service',
service_entry => { 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'], require => File['/etc/puppetlabs/puppet/ssl/crl.pem'],
} }

10
site/profiles/manifests/puppet/server.pp
View File

@ -71,4 +71,14 @@ class profiles::puppet::server (
hasstatus => true, hasstatus => true,
hasrestart => 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",
],
},
}
} }