jenkins-bot has submitted this change and it was merged. Change subject: ho ho (not) very much ......................................................................
ho ho (not) very much Due to https://github.com/facebook/hhvm/issues/1437 not much works. Basically you can browse around logged in over http if you set the hhvm=1 cookie. Change-Id: Ic9cdd67e120fb7fecb7eeef5d22e19b4008744c5 --- A puppet/modules/hhvm/manifests/init.pp M puppet/modules/nginx/files/translatewiki.net M puppet/site.pp 3 files changed, 32 insertions(+), 1 deletion(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/hhvm/manifests/init.pp b/puppet/modules/hhvm/manifests/init.pp new file mode 100644 index 0000000..182daab --- /dev/null +++ b/puppet/modules/hhvm/manifests/init.pp @@ -0,0 +1,24 @@ +class hhvm { + include apt + + apt::source { 'hhvm': + location => 'http://dl.hhvm.com/ubuntu', + repos => 'main', + key => '1BE7A449', + key_server => 'pgp.mit.edu', + include_src => false, + } + + package { 'hhvm-fastcgi': + ensure => present, + require => Apt::Source['hhvm'], + } + + service { 'hhvm-fastcgi': + ensure => running, + enable => true, + hasstatus => true, + hasrestart => true, + require => [ Package['hhvm-fastcgi'] ], + } +} diff --git a/puppet/modules/nginx/files/translatewiki.net b/puppet/modules/nginx/files/translatewiki.net index d291e1e..f4f8279 100644 --- a/puppet/modules/nginx/files/translatewiki.net +++ b/puppet/modules/nginx/files/translatewiki.net @@ -35,7 +35,13 @@ # Allowed php files, case sensitive location ~ ^/w/(i|index|load|api|opensearch_desc|profileinfo|webfiles/jserror)\.php$ { - fastcgi_pass unix:/var/run/php5-fpm.sock; + set $fastcgi_pass_value unix:/var/run/php5-fpm.sock; + + if ($cookie_hhvm = "1") { + set $fastcgi_pass_value 127.0.0.1:9000; + } + + fastcgi_pass $fastcgi_pass_value; fastcgi_buffers 16 4k; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/puppet/site.pp b/puppet/site.pp index 168ab14..171d522 100644 --- a/puppet/site.pp +++ b/puppet/site.pp @@ -20,6 +20,7 @@ include translationmemory include users include composer + include hhvm class { 'backup': databases => ['translatewiki_net'], -- To view, visit https://gerrit.wikimedia.org/r/105677 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic9cdd67e120fb7fecb7eeef5d22e19b4008744c5 Gerrit-PatchSet: 5 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
