BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149243
Change subject: Add role::php5vhost
......................................................................
Add role::php5vhost
Add a new role which can be used to provision a vhost running the
primary wiki using php5's mod_php interpreter. This role can be useful
when debugging php5 vs hhvm behavior differences.
Bug: 67517
Change-Id: I43ab9de1bdf4e1a1118752b73a3161c586b12854
---
A puppet/manifests/roles/php5vhost.pp
A puppet/modules/mediawiki/files/mediawiki-vagrant-hhvm.png
A puppet/modules/mediawiki/files/mediawiki-vagrant-php5.png
M puppet/modules/mediawiki/manifests/init.pp
M puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
A puppet/templates/php5vhost.conf.erb
6 files changed, 58 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/43/149243/1
diff --git a/puppet/manifests/roles/php5vhost.pp
b/puppet/manifests/roles/php5vhost.pp
new file mode 100644
index 0000000..6891e45
--- /dev/null
+++ b/puppet/manifests/roles/php5vhost.pp
@@ -0,0 +1,12 @@
+# == Class: role::php5vhost
+# Provision a vhost running the primary wiki using php5's mod_php interpreter.
+# This role can be useful when debugging php5 vs hhvm behavior differences.
+#
+class role::php5vhost {
+ include role::mediawiki
+
+ apache::site { 'php5vhost':
+ ensure => present,
+ content => template('php5vhost.conf.erb'),
+ }
+}
diff --git a/puppet/modules/mediawiki/files/mediawiki-vagrant-hhvm.png
b/puppet/modules/mediawiki/files/mediawiki-vagrant-hhvm.png
new file mode 100644
index 0000000..e4df121
--- /dev/null
+++ b/puppet/modules/mediawiki/files/mediawiki-vagrant-hhvm.png
Binary files differ
diff --git a/puppet/modules/mediawiki/files/mediawiki-vagrant-php5.png
b/puppet/modules/mediawiki/files/mediawiki-vagrant-php5.png
new file mode 100644
index 0000000..ef1f3e8
--- /dev/null
+++ b/puppet/modules/mediawiki/files/mediawiki-vagrant-php5.png
Binary files differ
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 9323417..6113591 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -147,6 +147,14 @@
source => 'puppet:///modules/mediawiki/mediawiki-vagrant.png',
}
+ file { '/var/www/mediawiki-vagrant-hhvm.png':
+ source => 'puppet:///modules/mediawiki/mediawiki-vagrant-hhvm.png',
+ }
+
+ file { '/var/www/mediawiki-vagrant-php5.png':
+ source => 'puppet:///modules/mediawiki/mediawiki-vagrant-php5.png',
+ }
+
file { '/usr/local/bin/run-mediawiki-tests':
source => 'puppet:///modules/mediawiki/run-mediawiki-tests',
mode => '0755',
diff --git a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
index 87bc5e0..6b363ec 100644
--- a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
+++ b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
@@ -29,10 +29,10 @@
Alias /w "<%= scope['mediawiki::dir'] %>"
Alias /images "<%= scope['mediawiki::upload_dir'] %>"
-Alias /mediawiki-vagrant.png /var/www/mediawiki-vagrant.png
Alias /favicon.ico /var/www/favicon.ico
<IfDefine !ZEND>
+ Alias /mediawiki-vagrant.png /var/www/mediawiki-vagrant-hhvm.png
ProxyPass /wiki fcgi://127.0.0.1:9000/<%=
scope['::mediawiki::dir'] %>/index.php retry=0
ProxyPass /w/extensions !
ProxyPassMatch ^/w/(.*\.(php|hh))$ fcgi://127.0.0.1:9000/<%=
scope['::mediawiki::dir'] %>/$1 retry=0
@@ -40,6 +40,7 @@
</IfDefine>
<IfDefine ZEND>
+ Alias /mediawiki-vagrant.png /var/www/mediawiki-vagrant-php5.png
RewriteRule ^/$ /w/index.php [R=301]
Alias /wiki "<%= scope['mediawiki::dir'] %>/index.php"
</IfDefine>
diff --git a/puppet/templates/php5vhost.conf.erb
b/puppet/templates/php5vhost.conf.erb
new file mode 100644
index 0000000..18e0c4e
--- /dev/null
+++ b/puppet/templates/php5vhost.conf.erb
@@ -0,0 +1,36 @@
+# vim: filetype=apache sts=4 sw=4 autoindent
+#
+# Apache site configuration for MediaWiki
+# This file is managed by Puppet.
+#
+ServerName php5.local.wmftest.net
+ServerAdmin http://www.mediawiki.org/wiki/Vagrant
+DocumentRoot "/var/www"
+LogLevel error
+
+<Directory />
+ Options FollowSymLinks
+ AllowOverride None
+</Directory>
+
+<Directory /var/www/>
+</Directory>
+
+<Directory <%= scope['mediawiki::dir'] %>>
+ Require all granted
+</Directory>
+
+<Directory <%= scope['mediawiki::upload_dir'] %>>
+ Require all granted
+</Directory>
+
+AllowEncodedSlashes on
+RewriteEngine On
+
+Alias /w "<%= scope['mediawiki::dir'] %>"
+Alias /images "<%= scope['mediawiki::upload_dir'] %>"
+Alias /mediawiki-vagrant.png /var/www/mediawiki-vagrant-php5.png
+Alias /favicon.ico /var/www/favicon.ico
+
+RewriteRule ^/$ /w/index.php [R=301]
+Alias /wiki "<%= scope['mediawiki::dir'] %>/index.php"
--
To view, visit https://gerrit.wikimedia.org/r/149243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43ab9de1bdf4e1a1118752b73a3161c586b12854
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
