Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/154027
Change subject: Fix-ups for I3d002968c
......................................................................
Fix-ups for I3d002968c
* Remove trailing whitespace and tabs from jobrunner.site.conf.
* Use priority => 10 for the listen directive (always using the minimum and
maximum for priorities means you don't leave room for future additions.)
Change-Id: I0008c6ed03e074b0c228c0cce9f8734eee00917f
---
M modules/mediawiki/files/jobrunner.site.conf
M modules/mediawiki/manifests/jobrunner.pp
2 files changed, 6 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/154027/1
diff --git a/modules/mediawiki/files/jobrunner.site.conf
b/modules/mediawiki/files/jobrunner.site.conf
index 9067940..618a845 100644
--- a/modules/mediawiki/files/jobrunner.site.conf
+++ b/modules/mediawiki/files/jobrunner.site.conf
@@ -1,12 +1,10 @@
# 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
+
+ ErrorLog ${APACHE_LOG_DIR}/jobqueue-error.log
+ CustomLog ${APACHE_LOG_DIR}/jobqueue-access.log combined
</VirtualHost>
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index ee1c4bc..c271254 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -66,20 +66,13 @@
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",
+ content => 'Listen 9002',
+ priority => 10,
}
- apache::site{ 'hhvm_jobrunner':
- priority => 1,
+ apache::site { 'hhvm_jobrunner':
source => 'puppet:///modules/mediawiki/jobrunner.site.conf',
}
}
-
}
--
To view, visit https://gerrit.wikimedia.org/r/154027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0008c6ed03e074b0c228c0cce9f8734eee00917f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
