jenkins-bot has submitted this change and it was merged.
Change subject: Route eventlogging-devserver from 8080 to 8100
......................................................................
Route eventlogging-devserver from 8080 to 8100
To be able to execute eventlogging-devserver inside vagrant,
this fix makes EventLogging client request through 8080 port
and configures apache to reverse-proxy 8080 to 8100,
the port eventlogging-devserver should be listening to.
Bug: T86067
Change-Id: Iacde21353d112d212b84cb022abbf1899e562322
---
M puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
M puppet/modules/role/manifests/eventlogging.pp
2 files changed, 13 insertions(+), 1 deletion(-)
Approvals:
Nuria: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
index d9d4b9e..c9af312 100644
--- a/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
+++ b/puppet/modules/mediawiki/templates/mediawiki-apache-site.erb
@@ -43,3 +43,9 @@
RewriteRule ^/$ /w/index.php [R=301]
Alias /wiki <%= @docroot %>/w/index.php
</IfDefine>
+
+# Reverse proxy for eventlogging devserver
+<IfDefine ELDevServer>
+ ProxyPass /event.gif http://127.0.0.1:8100/event.gif
+ ProxyPassReverse /event.gif http://127.0.0.1:8100/event.gif
+</IfDefine>
diff --git a/puppet/modules/role/manifests/eventlogging.pp
b/puppet/modules/role/manifests/eventlogging.pp
index d9f41cc..a68823f 100644
--- a/puppet/modules/role/manifests/eventlogging.pp
+++ b/puppet/modules/role/manifests/eventlogging.pp
@@ -3,11 +3,17 @@
# events are validated against production schemas but logged locally.
class role::eventlogging {
include ::role::geshi
+ include ::apache::mod::proxy
+ include ::apache::mod::proxy_http
+ include ::apache::mod::headers
+
+ # Define a 'ELDevServer' parameter for Apache <IfDefine> checks.
+ apache::def { 'ELDevServer': }
mediawiki::extension { 'EventLogging':
priority => $::LOAD_EARLY,
settings => {
- wgEventLoggingBaseUri => '//localhost:8100/event.gif',
+ wgEventLoggingBaseUri => '//localhost:8080/event.gif',
wgEventLoggingFile => '/vagrant/logs/eventlogging.log',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/184794
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacde21353d112d212b84cb022abbf1899e562322
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mforns <[email protected]>
Gerrit-Reviewer: Mforns <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
Gerrit-Reviewer: Nuria <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
