Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154028
Change subject: jobrunner: parametrize the port for the fcgi interface
......................................................................
jobrunner: parametrize the port for the fcgi interface
Change-Id: I8e92a0689c5ab41cc3fdbc8bb816bba356390ceb
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
R modules/mediawiki/templates/jobrunner/site.conf.erb
3 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/154028/1
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ee1c4bc..0ca7ec3 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,6 +12,7 @@
$runners_parsoid = 0,
$runners_transcode = 0,
$statsd_server = undef,
+ $jr_port = 9002,
) {
include ::passwords::redis
@@ -73,12 +74,12 @@
apache::conf { 'hhvm_jobrunner_port':
priority => 1,
- content => "# This file is managed by Puppet\nListen 9002\n",
+ content => inline_template("# This file is managed by
Puppet\nListen <%= @jr_port %>\n",)
}
apache::site{ 'hhvm_jobrunner':
priority => 1,
- source => 'puppet:///modules/mediawiki/jobrunner.site.conf',
+ content =>
template('puppet:///modules/mediawiki/jobrunner/site.conf.erb')
}
}
diff --git a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
index 58bbea5..f0d6737 100644
--- a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
+++ b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
@@ -1 +1 @@
-curl -XPOST -s -a
'http:\/\/127.0.0.1:9002\/rpc\/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'
\ No newline at end of file
+curl -XPOST -s -a 'http:\/\/127.0.0.1:<%= @jr_port
%>\/rpc\/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/templates/jobrunner/site.conf.erb
similarity index 62%
rename from modules/mediawiki/files/jobrunner.site.conf
rename to modules/mediawiki/templates/jobrunner/site.conf.erb
index 9067940..5d40d21 100644
--- a/modules/mediawiki/files/jobrunner.site.conf
+++ b/modules/mediawiki/templates/jobrunner/site.conf.erb
@@ -1,12 +1,9 @@
# This file is managed by Puppet
-<VirtualHost *:9002>
+<VirtualHost *:<%= @jr_port %>>
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
+ ErrorLog ${APACHE_LOG_DIR}/jobqueue-error.log
+ CustomLog ${APACHE_LOG_DIR}/jobqueue-access.log combined
</VirtualHost>
--
To view, visit https://gerrit.wikimedia.org/r/154028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e92a0689c5ab41cc3fdbc8bb816bba356390ceb
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
