Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154021
Change subject: jobrunner: puppetize HAT runner
......................................................................
jobrunner: puppetize HAT runner
The HAT jobrunner will spawn jobs by polling the fastcgi hhvm daemon via
curl spawned by the jobrunner loop. In detail:
* added a virtual host and the corresponding port definition
* added the apache modules needed
* disabled jit from command-line hhvm config
Change-Id: I3d002968c30827b2e8c0fdf6fc55d8846080a104
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
A modules/hhvm/files/config-cli.hdf
M modules/hhvm/manifests/init.pp
A modules/mediawiki/files/jobrunner.site.conf
M modules/mediawiki/manifests/jobrunner.pp
4 files changed, 50 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/154021/1
diff --git a/modules/hhvm/files/config-cli.hdf
b/modules/hhvm/files/config-cli.hdf
new file mode 100644
index 0000000..98120f8
--- /dev/null
+++ b/modules/hhvm/files/config-cli.hdf
@@ -0,0 +1,17 @@
+# Configuration for HHVM
+#
+# Note: HDF syntax is deprecated. Use php.ini where possible.
+# The configuration options declared in this file do not have
+# php.ini equivalents yet (Aug 2014).
+#
+# This file is managed by Puppet.
+DynamicExtensions {
+ * = fss.so
+ * = luasandbox.so
+ * = wikidiff2.so
+}
+
+Eval {
+ PerfPidMap = false
+ Jit = false
+}
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 3ffb02f..80583be 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -129,7 +129,7 @@
}
file { '/etc/hhvm/config.hdf':
- source => 'puppet:///modules/hhvm/config.hdf',
+ source => 'puppet:///modules/hhvm/config-cli.hdf',
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/files/jobrunner.site.conf
new file mode 100644
index 0000000..9067940
--- /dev/null
+++ b/modules/mediawiki/files/jobrunner.site.conf
@@ -0,0 +1,12 @@
+# This file is managed by Puppet
+<VirtualHost *:9002>
+ DocumentRoot "/usr/local/apache/common"
+
+ ServerAdmin r...@wikimedia.org
+
+ # Pass requests to the HHVM FastCGI server
+ ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
+
+ ErrorLog ${APACHE_LOG_DIR}/jobqueue-fcgi-error.log
+ CustomLog ${APACHE_LOG_DIR}/jobqueue-fcgi-access.log combined
+</VirtualHost>
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index fe7dddb..ee1c4bc 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -62,4 +62,24 @@
group => 'root',
mode => '0444',
}
+
+ if ubuntu_version('>= trusty') {
+ include ::apache::mod::proxy_fcgi
+
+ # Temporarily disabled, need hhvm repackaging
+ #class { 'apache::mpm':
+ # mpm => 'worker',
+ #}
+
+ apache::conf { 'hhvm_jobrunner_port':
+ priority => 1,
+ content => "# This file is managed by Puppet\nListen 9002\n",
+ }
+
+ apache::site{ 'hhvm_jobrunner':
+ priority => 1,
+ source => 'puppet:///modules/mediawiki/jobrunner.site.conf',
+ }
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/154021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d002968c30827b2e8c0fdf6fc55d8846080a104
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
