Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/382221 )
Change subject: releases-jenkins: fix prefix for proxy setup, pt.2 ...................................................................... releases-jenkins: fix prefix for proxy setup, pt.2 Follow-up to Ib41ca5763b6ce82a3e which fixed Apache syntax error but didn't make it work. Prefix _should_ contain leading slash, compare to contint module where this originally comes from. So if it's "nothing" we still enter "/". Adjust template accordingly. We want to avoid having inconsistent prefix setting between jenkins and Apache classes. Bug: T164030 Change-Id: I84ccb5c63759441e4dffa562fc988fe73e96125e --- M hieradata/role/common/releases.yaml M modules/profile/manifests/releases/mediawiki.pp M modules/releases/templates/apache-jenkins.conf.erb 3 files changed, 8 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/21/382221/1 diff --git a/hieradata/role/common/releases.yaml b/hieradata/role/common/releases.yaml index 469f8f2..92ac574 100644 --- a/hieradata/role/common/releases.yaml +++ b/hieradata/role/common/releases.yaml @@ -5,5 +5,5 @@ profile::releases::mediawiki::sitename: 'releases.wikimedia.org' profile::releases::mediawiki::sitename_jenkins: 'releases-jenkins.wikimedia.org' profile::releases::mediawiki::server_admin: '[email protected]' -profile::releases::mediawiki::prefix: '' +profile::releases::mediawiki::prefix: '/' profile::releases::mediawiki::http_port: '8080' diff --git a/modules/profile/manifests/releases/mediawiki.pp b/modules/profile/manifests/releases/mediawiki.pp index f68ce91..14daee1 100644 --- a/modules/profile/manifests/releases/mediawiki.pp +++ b/modules/profile/manifests/releases/mediawiki.pp @@ -11,16 +11,16 @@ ){ class { '::jenkins': access_log => true, - http_port => '8080', - prefix => '/', + http_port => $http_port, + prefix => $prefix, umask => '0002', } class { '::releases': sitename => $sitename, sitename_jenkins => $sitename_jenkins, - http_port => '8080', - prefix => '/', + http_port => $http_port, + prefix => $prefix, } class { '::apache::mod::rewrite': } diff --git a/modules/releases/templates/apache-jenkins.conf.erb b/modules/releases/templates/apache-jenkins.conf.erb index fa924dc..8853f3a 100644 --- a/modules/releases/templates/apache-jenkins.conf.erb +++ b/modules/releases/templates/apache-jenkins.conf.erb @@ -16,8 +16,8 @@ ProxyRequests Off ProxyVia Off ProxyPreserveHost On - ProxyPass /<%= @prefix -%> http://127.0.0.1:<%= @http_port -%><%= @prefix -%>/ retry=0 nocanon - ProxyPassReverse /<%= @prefix -%> http://localhost:<%= @http_port -%><%= @prefix -%> + ProxyPass <%= @prefix -%> http://127.0.0.1:<%= @http_port -%><%= @prefix -%>/ retry=0 nocanon + ProxyPassReverse <%= @prefix -%> http://localhost:<%= @http_port -%><%= @prefix -%> ErrorLog /var/log/apache2/<%= @sitename_jenkins %>.error.log @@ -29,7 +29,7 @@ # Local reverse proxy authorization override # Most unix distribution deny proxy by default (ie /etc/apache2/mods-enabled/proxy.conf in Debian) - <Proxy http://localhost:<%= @http_port -%>/<%= @prefix -%>*> + <Proxy http://localhost:<%= @http_port -%><%= @prefix -%>*> # user agent blacklisting for Jenkins SetEnvIf User-Agent 80legs bad_browser -- To view, visit https://gerrit.wikimedia.org/r/382221 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I84ccb5c63759441e4dffa562fc988fe73e96125e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
