Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/285368
Change subject: mediawiki::web: drop HHVM define, explicitly block php
......................................................................
mediawiki::web: drop HHVM define, explicitly block php
Bug: T126310
Change-Id: I4afc87c11b297341b3f3454c631b0b72b8f6f122
---
M modules/mediawiki/files/apache/configs/hhvm_catchall.conf
M modules/mediawiki/files/apache/modules/mime.conf
M modules/mediawiki/manifests/web.pp
M modules/mediawiki/templates/apache/apache2.conf.erb
4 files changed, 13 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/285368/1
diff --git a/modules/mediawiki/files/apache/configs/hhvm_catchall.conf
b/modules/mediawiki/files/apache/configs/hhvm_catchall.conf
index 32bc3bf..df34212 100644
--- a/modules/mediawiki/files/apache/configs/hhvm_catchall.conf
+++ b/modules/mediawiki/files/apache/configs/hhvm_catchall.conf
@@ -1,7 +1,5 @@
# This file is managed by puppet
# Execute all PHP (and Hack) files via HHVM.
-<IfDefine HHVM>
- <FilesMatch "\.(php|hh)$">
- RewriteRule ^(.*)$ fcgi://127.0.0.1:9000$1 [P]
- </FilesMatch>
-</IfDefine>
+<FilesMatch "\.(php|hh)$">
+ RewriteRule ^(.*)$ fcgi://127.0.0.1:9000$1 [P]
+</FilesMatch>
diff --git a/modules/mediawiki/files/apache/modules/mime.conf
b/modules/mediawiki/files/apache/modules/mime.conf
index 0bb5b42..f989259 100644
--- a/modules/mediawiki/files/apache/modules/mime.conf
+++ b/modules/mediawiki/files/apache/modules/mime.conf
@@ -56,9 +56,4 @@
# TTF doesn't have an official MIME type, but I really don't want to use
application/octet-stream for it
AddType application/x-font-ttf .ttf
- # TODO: Remove this once migrated as we don't need this for HHVM at all
- <IfModule mod_php5.c>
- AddType application/x-httpd-php .php .php5 .php4 .php3 .phtml
- AddType application/x-httpd-php-source .phps
- </IfModule>
</IfModule>
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index 5f6fbcc..337eec2 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -37,7 +37,11 @@
},
}
- apache::def { 'HHVM': }
+
+ # Not needed anymore. TODO: remove at a later stage
+ apache::def { 'HHVM':
+ ensure => absent
+ }
# Set the Server response header to be equal to the app server FQDN.
include ::apache::mod::security2
diff --git a/modules/mediawiki/templates/apache/apache2.conf.erb
b/modules/mediawiki/templates/apache/apache2.conf.erb
index 25a195a..591d2e9 100644
--- a/modules/mediawiki/templates/apache/apache2.conf.erb
+++ b/modules/mediawiki/templates/apache/apache2.conf.erb
@@ -14,6 +14,11 @@
Include mods-enabled/*.load
Include mods-enabled/*.conf
+# Ensure that mod_php is never use even if present
+<IfModule mod_php5.c>
+ php_admin_flag engine off
+</IfModule>
+
Include conf-enabled/*.conf
Include ports.conf
--
To view, visit https://gerrit.wikimedia.org/r/285368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4afc87c11b297341b3f3454c631b0b72b8f6f122
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
