2 files changed, 35 insertions, 12 deletions
diff --git a/puppet/modules/site_apache/manifests/common.pp b/puppet/modules/site_apache/manifests/common.pp
index 208c15d5..74116575 100644
--- a/puppet/modules/site_apache/manifests/common.pp
+++ b/puppet/modules/site_apache/manifests/common.pp
@@ -13,20 +13,13 @@ class site_apache::common {
   # needed for the mod_ssl config
   include apache::module::mime
 
-  # load mods depending on apache version
-  if ( $::lsbdistcodename == 'jessie' ) {
-    # apache >= 2.4, debian jessie
-    # needed for mod_ssl config
-    include apache::module::socache_shmcb
-    # generally needed
-    include apache::module::mpm_prefork
-  } else {
-    # apache < 2.4, debian wheezy
-    # for "Order" directive, i.e. main apache2.conf
-    include apache::module::authz_host
-  }
+  # needed for mod_ssl config
+  include apache::module::socache_shmcb
+  # generally needed
+  include apache::module::mpm_prefork
 
   include site_apache::common::tls
   include site_apache::common::acme
+  include site_apache::common::autorestart
 
 }
diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp
new file mode 100644
index 00000000..8b7b590d
--- /dev/null
+++ b/puppet/modules/site_apache/manifests/common/autorestart.pp
@@ -0,0 +1,30 @@
+#
+# Adds autorestart extension to apache on crash
+#
+class site_apache::common::autorestart {
+
+  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':
+    source  => 'puppet:///modules/site_apache/autorestart.conf',
+    require => [
+      File['/etc/systemd/system/apache2.service.d'],
+      Service['apache'],
+    ]
+  }
+}