summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2020-05-13 23:08:56 +0200
committerJan Dittberner <jandd@cacert.org>2020-05-13 23:08:56 +0200
commit4899c298596caa2708d5e22d3c1ec06de974f8d1 (patch)
tree218057fc8086349a8f47797be3d3aa605201c4f6
parent2acad807b0d4748a33495a293c7cb88fa4dcb0d3 (diff)
downloadcacert-puppet-4899c298596caa2708d5e22d3c1ec06de974f8d1.tar.gz
cacert-puppet-4899c298596caa2708d5e22d3c1ec06de974f8d1.tar.xz
cacert-puppet-4899c298596caa2708d5e22d3c1ec06de974f8d1.zip
Fix Apache mod_php compatibility
-rw-r--r--sitemodules/profiles/manifests/apache_common.pp2
-rw-r--r--sitemodules/profiles/manifests/roundcube.pp6
2 files changed, 6 insertions, 2 deletions
diff --git a/sitemodules/profiles/manifests/apache_common.pp b/sitemodules/profiles/manifests/apache_common.pp
index 824947a..54ef5b3 100644
--- a/sitemodules/profiles/manifests/apache_common.pp
+++ b/sitemodules/profiles/manifests/apache_common.pp
@@ -24,7 +24,7 @@
class profiles::apache_common (
) {
class { 'apache':
- default_vhost => false,
+ default_vhost => false,
default_ssl_vhost => false,
}
}
diff --git a/sitemodules/profiles/manifests/roundcube.pp b/sitemodules/profiles/manifests/roundcube.pp
index 15f1bb1..648a3e6 100644
--- a/sitemodules/profiles/manifests/roundcube.pp
+++ b/sitemodules/profiles/manifests/roundcube.pp
@@ -56,7 +56,6 @@ class profiles::roundcube (
String $mail_debug = 'false',
String $external_name = 'community.cacert.org',
) {
- include profiles::apache_common
include profiles::cacert_debrepo
package { 'mariadb-server':
@@ -236,6 +235,11 @@ class profiles::roundcube (
require => File['/etc/apache2/ssl/private'],
}
+ class { 'apache':
+ default_vhost => false,
+ default_ssl_vhost => false,
+ mpm_module => 'prefork',
+ }
class { 'apache::mod::php': }
apache::vhost { "${external_name}-http":
vhost_name => '*',