diff options
| author | Micah Anderson <micah@riseup.net> | 2017-07-12 13:29:06 -0700 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-07-13 09:40:05 -0700 |
| commit | f9ff6afebde2fe037fc9a90928501ff1a8d4ccde (patch) | |
| tree | 709f126a5ad633dee39853e1e459fb92ec5d1fb9 /puppet/modules/site_apache | |
| parent | a38a421a17b199e2207bc0009cba6869d17d4c21 (diff) | |
bug: Set .placeholder to fix removal
Add a .placeholder file so the directory doesn't get removed by
deb-systemd-helper when a package runs a purge in its postrm. This is a
work-around and fixes #8841. It probably wont be needed post-jessie.
Diffstat (limited to 'puppet/modules/site_apache')
| -rw-r--r-- | puppet/modules/site_apache/manifests/common/autorestart.pp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp index 6d8c4c3a..8b7b590d 100644 --- a/puppet/modules/site_apache/manifests/common/autorestart.pp +++ b/puppet/modules/site_apache/manifests/common/autorestart.pp @@ -3,11 +3,21 @@ # class site_apache::common::autorestart { - file { '/etc/systemd/system/apache2.service.d': - ensure => directory, - owner => root, - group => root, - mode => '0755', + file { + '/etc/systemd/system/apache2.service.d': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755'; + + # Add .placeholder file so directory doesn't get removed by + # deb-systemd-helper in a package removal postrm, see + # issue #8841 for more details. + '/etc/systemd/system/apache2.service.d/.placeholder': + ensure => file, + owner => 'root', + group => 'root', + mode => '0755'; } ::systemd::unit_file { 'apache2.service.d/autorestart.conf': |