Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/150499
Change subject: mediawiki: fix issues with moving to mods-enabled
......................................................................
mediawiki: fix issues with moving to mods-enabled
Change-Id: I2c3583141d416a2279139cc05ad495206ebbbca0
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/apache/manifests/mod.pp
M modules/mediawiki/manifests/web/modules.pp
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/150499/1
diff --git a/modules/apache/manifests/mod.pp b/modules/apache/manifests/mod.pp
index 2dd71c0..69bd30d 100644
--- a/modules/apache/manifests/mod.pp
+++ b/modules/apache/manifests/mod.pp
@@ -23,6 +23,7 @@
class apache::mod::expires { apache::mod_conf { 'expires': } }
class apache::mod::filter { apache::mod_conf { 'filter': } }
class apache::mod::headers { apache::mod_conf { 'headers': } }
+class apache::mod::mime { apache::mod_conf { 'mime': } }
class apache::mod::proxy { apache::mod_conf { 'proxy': } }
class apache::mod::proxy_balancer { apache::mod_conf { 'proxy_balancer': } }
class apache::mod::proxy_http { apache::mod_conf { 'proxy_http': } }
diff --git a/modules/mediawiki/manifests/web/modules.pp
b/modules/mediawiki/manifests/web/modules.pp
index 3ded5d4..aa3f4a4 100644
--- a/modules/mediawiki/manifests/web/modules.pp
+++ b/modules/mediawiki/manifests/web/modules.pp
@@ -14,6 +14,10 @@
include apache::mod::mime
include apache::mod::status
+ apache::mod_conf { ['cgi','negotiation', 'authn_file']:
+ ensure => absent
+ }
+
if $use_hhvm {
include apache::mod::proxy_fcgi
@@ -31,6 +35,7 @@
include apache::mod::php5
}
+
# This will be useful once we switch to mpm worker. Please keep it.
file { '/etc/apache2/mods-available/mpm_prefork.conf':
ensure => present,
@@ -42,6 +47,14 @@
before => Class['apache::mpm'],
}
+ # As we already have apache::mpm declared, the prefork conf file
+ # wouldn't be loaded or linked, so we ensure that manually.
+ file { '/etc/apache2/mods-enabled/mpm_prefork.conf':
+ ensure => link,
+ target => '/etc/apache2/mods-available/mpm_prefork.conf',
+ before => Class['apache::mpm']
+ }
+
file { '/etc/apache2/mods-available/expires.conf':
ensure => present,
source => 'puppet:///modules/mediawiki/apache/modules/expires.conf',
--
To view, visit https://gerrit.wikimedia.org/r/150499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c3583141d416a2279139cc05ad495206ebbbca0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
