Mobrovac has submitted this change and it was merged.
Change subject: jobrunner: fix for vms with multiple default vhosts
......................................................................
jobrunner: fix for vms with multiple default vhosts
Add a 'Host: vagrant' header to jobrunner's curl command to help Apache
select the MediaWiki vhost. This will fix a bug for VMs that have
enabled roles which add new vhosts that bind to _default_:80 and will
also work as expected on "normal" VMs that are only using the MediaWiki
vhosts.
Change-Id: I7103b28cda87fb9b726744971cab95bcbfec9cd1
---
M puppet/modules/mediawiki/templates/jobrunner.json.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/templates/jobrunner.json.erb
b/puppet/modules/mediawiki/templates/jobrunner.json.erb
index 5a6f26b..922f71c 100644
--- a/puppet/modules/mediawiki/templates/jobrunner.json.erb
+++ b/puppet/modules/mediawiki/templates/jobrunner.json.erb
@@ -28,5 +28,5 @@
"period": 1
},
- "dispatcher": "curl -XPOST -s -a
'http:\/\/127.0.0.1/w/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'"
+ "dispatcher": "curl -XPOST --silent --header 'Host: vagrant'
'http:\/\/127.0.0.1/w/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'"
}
--
To view, visit https://gerrit.wikimedia.org/r/298017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7103b28cda87fb9b726744971cab95bcbfec9cd1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
