Several PHP7 fixes: TalkRight, xhprof, mongo, php5_module

* Fix Extension:TalkRight fix for PHP7 * Temporarily remove profiling since xhprof doesn't work on PHP7 * Fix mongodb PECL package for PHP7 * Fix httpd.conf statements about php5_module
enterprisemediawiki · Apr 20, 2018 · 3ea4a9f · 3ea4a9f
1 parent ecc9e42
commit 3ea4a9f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/config/core/MezaCoreExtensions.yml b/config/core/MezaCoreExtensions.yml
@@ -202,7 +202,7 @@ list:
     legacy_load: true
   - name: TalkRight
     repo: https://github.com/enterprisemediawiki/TalkRight.git
-    version: extreg
+    version: master
     legacy_load: true
   - name: AdminLinks
     repo: https://gerrit.wikimedia.org/r/mediawiki/extensions/AdminLinks.git

diff --git a/src/roles/apache-php/tasks/main.yml b/src/roles/apache-php/tasks/main.yml
@@ -38,11 +38,11 @@
   include_role:
     name: composer
 
-- name: Ensure PHP profiling configured
-  include: profiling.yml
-  # http://docs.ansible.com/ansible/playbooks_roles.html#dynamic-versus-static-includes
-  static: yes
-  when: m_setup_php_profiling
+# - name: Ensure PHP profiling configured
+#   include: profiling.yml
+#   # http://docs.ansible.com/ansible/playbooks_roles.html#dynamic-versus-static-includes
+#   static: yes
+#   when: m_setup_php_profiling
 
 # If profiling not enabled, disable MongoDB if it exists (e.g. profiling had
 # previously been enabled)

diff --git a/src/roles/apache-php/tasks/profiling.yml b/src/roles/apache-php/tasks/profiling.yml
@@ -35,7 +35,7 @@
     state: present
   with_items:
     - pecl/xhprof-beta
-    - pecl/mongo
+    - pecl/mongodb
 
 - name: Ensure XHGui present
   git:

diff --git a/src/roles/apache-php/templates/httpd.conf.j2 b/src/roles/apache-php/templates/httpd.conf.j2
@@ -54,7 +54,6 @@ ServerRoot "/etc/httpd"
 # LoadModule foo_module modules/mod_foo.so
 #
 Include conf.modules.d/*.conf
-LoadModule php5_module		modules/libphp5.so
 
 <IfModule unixd_module>
 #
@@ -426,7 +425,7 @@ Listen 8080
 
 	{% if m_setup_php_profiling -%}
 	# Prepends file all files to initiate profiling
-	php_admin_value auto_prepend_file "{{ m_profiling_xhgui_directory }}/external/header.php"
+	# php_admin_value auto_prepend_file "{{ m_profiling_xhgui_directory }}/external/header.php"
 	{% endif %}
 
 </VirtualHost>
@@ -473,7 +472,7 @@ Listen 8090
 <FilesMatch "\.ph(p[2-6]?|tml)$">
 	SetHandler application/x-httpd-php
 </FilesMatch>
-<IfModule !php5_module>
+<IfModule !php7_module>
 	<FilesMatch "\.ph(p[2-6]?|tml)$">
 		Order allow,deny
 		Deny from all