From f9ff6afebde2fe037fc9a90928501ff1a8d4ccde Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 12 Jul 2017 13:29:06 -0700
Subject: [PATCH] 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.
---
.../manifests/common/autorestart.pp | 20 ++++++++++++++-----
1 file 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':
--
GitLab