BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/398707 )
Change subject: [WIP] Make PHP7 the default runtime
......................................................................
[WIP] Make PHP7 the default runtime
Move HHVM runtime to a role and make PHP7 the default runtime for the
wikis.
Bug: T181915
Change-Id: Ib1f2473597ecdaf48eb830aafd2606f271e26b48
---
M puppet/hieradata/common.yaml
M puppet/modules/hhvm/manifests/init.pp
M puppet/modules/mediawiki/manifests/apache.pp
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/manifests/mwrepl.pp
M puppet/modules/mediawiki/manifests/ready_service.pp
M puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
D puppet/modules/mediawiki/templates/mediawiki-php7-site.erb
M puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb
M puppet/modules/mediawiki/templates/systemd/jobchron.erb
M puppet/modules/mediawiki/templates/systemd/jobrunner.erb
M puppet/modules/php/manifests/composer.pp
A puppet/modules/role/manifests/hhvm.pp
M puppet/modules/role/manifests/scribunto.pp
D puppet/modules/role/manifests/zend.pp
15 files changed, 21 insertions(+), 93 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/07/398707/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3eb1b97..d0640d8 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -225,7 +225,6 @@
mediawiki::branch: master
mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
-mediawiki::apache::php7_site_name: "php7%{hiera('mwv::tld')}"
mediawiki::jobrunner::enable: true
mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
diff --git a/puppet/modules/hhvm/manifests/init.pp
b/puppet/modules/hhvm/manifests/init.pp
index 52846ec..403c74a 100644
--- a/puppet/modules/hhvm/manifests/init.pp
+++ b/puppet/modules/hhvm/manifests/init.pp
@@ -63,12 +63,6 @@
require => Package['hhvm'],
}
- env::alternative { 'hhvm_as_default_php':
- alternative => 'php',
- target => '/usr/bin/hhvm',
- priority => 20,
- }
-
file { '/etc/hhvm':
ensure => directory,
owner => 'root',
@@ -82,7 +76,6 @@
group => 'root',
mode => '0444',
content => php_ini($common_settings),
- before => Env::Alternative['hhvm_as_default_php'],
}
file { '/etc/hhvm/server.ini':
@@ -121,7 +114,6 @@
owner => 'www-data',
group => 'www-data',
mode => '0666',
- before => Env::Alternative['hhvm_as_default_php'],
}
file { $fcgi_settings['hhvm']['repo']['central']['path']:
diff --git a/puppet/modules/mediawiki/manifests/apache.pp
b/puppet/modules/mediawiki/manifests/apache.pp
index ad698b0..fa71bca 100644
--- a/puppet/modules/mediawiki/manifests/apache.pp
+++ b/puppet/modules/mediawiki/manifests/apache.pp
@@ -7,12 +7,8 @@
# [*docroot*]
# Document root for Apache vhost serving MediaWiki.
#
-# [*php7_site_name*]
-# Hostname for php7 runtime Apache vhost
-#
class mediawiki::apache(
$docroot,
- $php7_site_name,
) {
include ::mediawiki
include ::mediawiki::multiwiki
@@ -35,15 +31,6 @@
Class['::apache::mod::alias'],
Class['::apache::mod::rewrite'],
Class['::apache::mod::proxy_fcgi'],
- ],
- }
-
- apache::site { "php7-${mediawiki::wiki_name}":
- ensure => present,
- content => template('mediawiki/mediawiki-php7-site.erb'),
- require => [
- Class['::apache::mod::alias'],
- Class['::apache::mod::rewrite'],
],
}
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 2dea2a3..3bb641c 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -69,8 +69,6 @@
include ::mwv
require ::php
- require ::hhvm
- include ::hhvm::fcgi
require ::service
diff --git a/puppet/modules/mediawiki/manifests/mwrepl.pp
b/puppet/modules/mediawiki/manifests/mwrepl.pp
index 8881a2a..caf416b 100644
--- a/puppet/modules/mediawiki/manifests/mwrepl.pp
+++ b/puppet/modules/mediawiki/manifests/mwrepl.pp
@@ -21,10 +21,4 @@
group => 'root',
mode => '0555',
}
-
- # Backwards compatibility
- file { '/usr/local/bin/hhvmsh':
- ensure => 'link',
- target => '/usr/local/bin/mwrepl',
- }
}
diff --git a/puppet/modules/mediawiki/manifests/ready_service.pp
b/puppet/modules/mediawiki/manifests/ready_service.pp
index af64928..74bdcfd 100644
--- a/puppet/modules/mediawiki/manifests/ready_service.pp
+++ b/puppet/modules/mediawiki/manifests/ready_service.pp
@@ -16,7 +16,6 @@
#
class mediawiki::ready_service {
include ::mediawiki
- include ::hhvm::fcgi
file { '/usr/local/bin/wait-for-mediawiki.sh':
ensure => 'present',
diff --git a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
index 75ed5de..633f9ee 100644
--- a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
+++ b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
@@ -26,17 +26,15 @@
AllowEncodedSlashes on
RewriteEngine On
-<IfDefine !ZEND>
+<IfDefine HHVM>
ProxyPass /wiki fcgi://127.0.0.1:9000<%= @docroot
%>/w/index.php retry=0
ProxyPass /w/extensions !
ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000<%= @docroot
%>/w/$1 retry=0
RewriteRule ^/$ fcgi://127.0.0.1:9000<%= @docroot
%>/w/index.php [P]
</IfDefine>
-<IfDefine ZEND>
- RewriteRule ^/$ /w/index.php [R=301]
- Alias /wiki <%= @docroot %>/w/index.php
-</IfDefine>
+RewriteRule ^/$ /w/index.php [R=301]
+Alias /wiki <%= @docroot %>/w/index.php
# Reverse proxy for eventlogging devserver
<IfDefine ELDevServer>
diff --git a/puppet/modules/mediawiki/templates/mediawiki-php7-site.erb
b/puppet/modules/mediawiki/templates/mediawiki-php7-site.erb
deleted file mode 100644
index 6e7e72a..0000000
--- a/puppet/modules/mediawiki/templates/mediawiki-php7-site.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-# vim: filetype=apache sts=4 sw=4 autoindent
-#
-# PHP7 Apache site configuration for MediaWiki
-# This file is managed by Puppet.
-#
-ServerName php7
-ServerAlias <%= @php7_site_name %>
-
-ServerAdmin http://www.mediawiki.org/wiki/Vagrant
-DocumentRoot <%= @docroot %>
-LogLevel error
-
-<Directory />
- Options FollowSymLinks
- AllowOverride None
-</Directory>
-
-<Directory <%= @docroot %>>
- Require all granted
-</Directory>
-
-<Directory <%= scope['mediawiki::dir'] %>>
- Require all granted
-</Directory>
-
-<Directory <%= scope['mediawiki::upload_dir'] %>>
- Require all granted
-</Directory>
-
-AllowEncodedSlashes on
-RewriteEngine On
-
-Alias /images "<%= scope['mediawiki::upload_dir'] %>"
-
-RewriteRule ^/$ /w/index.php [R=301]
-Alias /wiki <%= @docroot %>/w/index.php
diff --git a/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb
b/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb
index 3b6f7e4..a96137b 100755
--- a/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb
+++ b/puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb
@@ -6,7 +6,7 @@
LONGOPTIONS=help,engine:,wiki:,eval,plain
WIKI='<%= @default_db_name %>'
-ENGINE=hhvm
+ENGINE=php
ENGINE_FLAGS=
SCRIPT=shell.php
@@ -41,7 +41,7 @@
case "$2" in
zend|php)
# "php" is not documented but let's be liberal with what
we accept
- ENGINE=php7.0
+ ENGINE=php
;;
hhvm)
ENGINE=hhvm
diff --git a/puppet/modules/mediawiki/templates/systemd/jobchron.erb
b/puppet/modules/mediawiki/templates/systemd/jobchron.erb
index ba1f0df..55ce690 100644
--- a/puppet/modules/mediawiki/templates/systemd/jobchron.erb
+++ b/puppet/modules/mediawiki/templates/systemd/jobchron.erb
@@ -1,14 +1,14 @@
[Unit]
Description="Mediawiki job queue chron loop"
Requires=mediawiki-ready.service
-After=mediawiki-ready.service hhvm.service
+After=mediawiki-ready.service
[Service]
EnvironmentFile=/etc/default/jobrunner
User=www-data
Group=www-data
SyslogIdentifier=jobchron
-ExecStart=/usr/bin/php7.0 <%= @dir %>/redisJobChronService
--config-file=/etc/jobrunner.json ${DAEMON_OPTS}
+ExecStart=/usr/bin/php <%= @dir %>/redisJobChronService
--config-file=/etc/jobrunner.json ${DAEMON_OPTS}
Restart=always
[Install]
diff --git a/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
b/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
index 2e2c4b2..e47d236 100644
--- a/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
+++ b/puppet/modules/mediawiki/templates/systemd/jobrunner.erb
@@ -1,14 +1,14 @@
[Unit]
Description="Mediawiki job queue runner loop"
Requires=mediawiki-ready.service
-After=mediawiki-ready.service hhvm.service
+After=mediawiki-ready.service
[Service]
EnvironmentFile=/etc/default/jobrunner
User=www-data
Group=www-data
SyslogIdentifier=jobrunner
-ExecStart=/usr/bin/php7.0 <%= @dir %>/redisJobRunnerService
--config-file=/etc/jobrunner.json ${DAEMON_OPTS}
+ExecStart=/usr/bin/php <%= @dir %>/redisJobRunnerService
--config-file=/etc/jobrunner.json ${DAEMON_OPTS}
Restart=always
[Install]
diff --git a/puppet/modules/php/manifests/composer.pp
b/puppet/modules/php/manifests/composer.pp
index 5f80241..e8e9e9b 100644
--- a/puppet/modules/php/manifests/composer.pp
+++ b/puppet/modules/php/manifests/composer.pp
@@ -19,7 +19,7 @@
exec { 'download_composer':
command => "curl https://getcomposer.org/composer.phar -o ${bin}",
- unless => "php7.0 -r 'try { Phar::loadPhar(\"${bin}\"); exit(0); }
catch(Exception \$e) { exit(1); }'",
+ unless => "php -r 'try { Phar::loadPhar(\"${bin}\"); exit(0); }
catch(Exception \$e) { exit(1); }'",
require => Package['curl', 'php-cli'],
}
diff --git a/puppet/modules/role/manifests/hhvm.pp
b/puppet/modules/role/manifests/hhvm.pp
new file mode 100644
index 0000000..e3b2079
--- /dev/null
+++ b/puppet/modules/role/manifests/hhvm.pp
@@ -0,0 +1,10 @@
+# == Class: role::hhvm
+# This role will configure your MediaWiki instance to run under HHVM.
+class role::hhvm {
+ include ::role::mediawiki
+ include ::hhvm
+ include ::hhvm::fcgi
+
+ # Define a 'HHVM' parameter for Apache <IfDefine> checks.
+ apache::def { 'HHVM': }
+}
diff --git a/puppet/modules/role/manifests/scribunto.pp
b/puppet/modules/role/manifests/scribunto.pp
index 911cf86..e3df34d 100644
--- a/puppet/modules/role/manifests/scribunto.pp
+++ b/puppet/modules/role/manifests/scribunto.pp
@@ -18,7 +18,7 @@
require => [
Mediawiki::Extension['CodeEditor'],
Mediawiki::Extension['SyntaxHighlight_GeSHi'],
- Package['php-luasandbox', 'hhvm-luasandbox'],
+ Package['php-luasandbox'],
],
}
}
diff --git a/puppet/modules/role/manifests/zend.pp
b/puppet/modules/role/manifests/zend.pp
deleted file mode 100644
index 532f1b4..0000000
--- a/puppet/modules/role/manifests/zend.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# == Class: role::zend
-# This role will configure your MediaWiki instance to run using
-# Zend PHP.
-class role::zend {
- # Define a 'ZEND' parameter for Apache <IfDefine> checks.
- apache::def { 'ZEND': }
-
- env::alternative { 'zend_as_default_php':
- alternative => 'php',
- target => '/usr/bin/php7.0',
- priority => 25,
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/398707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1f2473597ecdaf48eb830aafd2606f271e26b48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
