Elukey has uploaded a new change for review. https://gerrit.wikimedia.org/r/309340
Change subject: Add mod_proxy_http and mod_xml2enc to the apache available modules. ...................................................................... Add mod_proxy_http and mod_xml2enc to the apache available modules. mod_proxy_http is available since Apache 2.2, meanwhile mod_xml2enc was an external module on 2.2: https://httpd.apache.org/docs/2.4/mod/mod_proxy_http.html https://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html Change-Id: If7cd9e29c5400408d9dc5c135183b83adc044b04 --- M modules/apache/manifests/mod.pp M modules/statistics/manifests/sites/yarn.pp M modules/statistics/templates/yarn.wikimedia.org.erb 3 files changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/40/309340/1 diff --git a/modules/apache/manifests/mod.pp b/modules/apache/manifests/mod.pp index dc0ea68..e47e1dc 100644 --- a/modules/apache/manifests/mod.pp +++ b/modules/apache/manifests/mod.pp @@ -31,6 +31,7 @@ class apache::mod::proxy { apache::mod_conf { 'proxy': } } class apache::mod::proxy_balancer { apache::mod_conf { 'proxy_balancer': } } class apache::mod::proxy_http { apache::mod_conf { 'proxy_http': } } +class apache::mod::proxy_html { apache::mod_conf { 'proxy_html': } } class apache::mod::rewrite { apache::mod_conf { 'rewrite': } } class apache::mod::setenvif { apache::mod_conf { 'setenvif': } } class apache::mod::ssl { apache::mod_conf { 'ssl': } } @@ -59,6 +60,7 @@ class apache::mod::remoteip { if os_version('debian >= jessie || ubuntu >= 13.10') { apache::mod_conf { 'remoteip': } } } class apache::mod::version { if os_version('ubuntu < 13.10') { apache::mod_conf { 'version': } } } class apache::mod::lbmethod_byrequests { if os_version('debian >= jessie || ubuntu >= 13.10') { apache::mod_conf { 'lbmethod_byrequests': } } } +class apache::mod::xml2enc { if os_version('debian >= jessie || ubuntu >= 13.10') { apache::mod_conf { 'xml2enc': } } } # lint:endignore # == Class: apache::mod::status diff --git a/modules/statistics/manifests/sites/yarn.pp b/modules/statistics/manifests/sites/yarn.pp index 2ab514b..d494521 100644 --- a/modules/statistics/manifests/sites/yarn.pp +++ b/modules/statistics/manifests/sites/yarn.pp @@ -11,7 +11,7 @@ include ::apache::mod::proxy_http include ::apache::mod::proxy - include ::apache::mod::substitute + include ::apache::mod::proxy_html include ::apache::mod::auth_basic include ::apache::mod::authnz_ldap include ::passwords::ldap::production diff --git a/modules/statistics/templates/yarn.wikimedia.org.erb b/modules/statistics/templates/yarn.wikimedia.org.erb index afa9392..043b1a1 100644 --- a/modules/statistics/templates/yarn.wikimedia.org.erb +++ b/modules/statistics/templates/yarn.wikimedia.org.erb @@ -30,10 +30,10 @@ # The Jetty Webserver (responsible for the Yarn UI) returns HTML with hardcoded # links in the HTML hrefs, so we need a way to avoid broken links. - # mod_substitute's output filter needs to run before deflate as outlined - # in https://httpd.apache.org/docs/2.4/mod/mod_substitute.html#comment_3856 - AddOutputFilterByType INFLATE;SUBSTITUTE;DEFLATE text/html text/plain text/xml - Substitute "s|http://analytics1001.eqiad.wmnet:\d+|http://yarn.wikimedia.org|q" + ProxyHTMLEnable On + ProxyHTMLLinks a href + ProxyHTMLURLMap http://analytics1001.eqiad.wmnet:8088/ / Lecn + ProxyHTMLURLMap http://analytics1001.eqiad.wmnet:19888/ / Lecn </Location> CustomLog /var/log/apache2/yarn.wikimedia.org-access.log wmf -- To view, visit https://gerrit.wikimedia.org/r/309340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7cd9e29c5400408d9dc5c135183b83adc044b04 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <ltosc...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
