ArielGlenn has submitted this change and it was merged. Change subject: adjust Zuul daemon web access ......................................................................
adjust Zuul daemon web access The Zuul daemon provides an HTTP interface which simply contains two pages: /status and /status.json. This patch tweak the proxy configuration to only proxy /zuul/status and /zuul/status.json leaving any /zuul/* url to land in the main document root. Change-Id: Ic36e12e19d328414263ef0e2377b7aa8089e2ce7 --- M modules/contint/files/apache/proxy_zuul 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/contint/files/apache/proxy_zuul b/modules/contint/files/apache/proxy_zuul index 8b338cd..400ee06 100644 --- a/modules/contint/files/apache/proxy_zuul +++ b/modules/contint/files/apache/proxy_zuul @@ -4,8 +4,10 @@ ##################################################################### # vim: filetype=apache -ProxyPass /zuul/ http://localhost:8001/ -ProxyPassReverse /zuul/ http://localhost:8001/ +ProxyPassMatch ^(/zuul/status)$ http://localhost:8001/$1 +ProxyPassMatch ^(/zuul/status\.json)$ http://localhost:8001/$1 +# No need for ProxyPassReverse since Zuul never redirect. + ProxyRequests Off # Local reverse proxy authorization override -- To view, visit https://gerrit.wikimedia.org/r/54845 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic36e12e19d328414263ef0e2377b7aa8089e2ce7 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
