Gergő Tisza has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378362 )
Change subject: Fix Apache port number in Vagrant role ...................................................................... Fix Apache port number in Vagrant role Change-Id: I4e1a20fc7d3186558f3161058e41598eaeeba19d --- M puppet/modules/varnish/manifests/init.pp R puppet/modules/varnish/templates/default-subs.vcl.erb 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant refs/changes/62/378362/1 diff --git a/puppet/modules/varnish/manifests/init.pp b/puppet/modules/varnish/manifests/init.pp index de1638f..4e2051e 100644 --- a/puppet/modules/varnish/manifests/init.pp +++ b/puppet/modules/varnish/manifests/init.pp @@ -116,7 +116,7 @@ varnish::backend { 'default': host => '127.0.0.1', - port => '8080', + port => $::forwarded_port, order => 20, } @@ -127,7 +127,7 @@ } varnish::config { 'default-subs': - source => 'puppet:///modules/varnish/default-subs.vcl', + content => template('varnish/default-subs.vcl.erb'), order => 50, } diff --git a/puppet/modules/varnish/files/default-subs.vcl b/puppet/modules/varnish/templates/default-subs.vcl.erb similarity index 96% rename from puppet/modules/varnish/files/default-subs.vcl rename to puppet/modules/varnish/templates/default-subs.vcl.erb index ffada70..d164e41 100644 --- a/puppet/modules/varnish/files/default-subs.vcl +++ b/puppet/modules/varnish/templates/default-subs.vcl.erb @@ -7,8 +7,8 @@ # Since we expose varnish on the default port (6081) we need to rewrite # requests that are generated using the default wiki port (8080) # This needs to be done early because it's needed for PURGE calls - if (req.url ~ ":8080") { - set req.url = regsub(req.url, "(.*):8080/(.*)", "\1:6081/\2"); + if (req.url ~ ":<%= scope[':forwarded_port'] %>") { + set req.url = regsub(req.url, "(.*):<%= scope[':forwarded_port'] %>/(.*)", "\1:6081/\2"); } # This uses the ACL action called "purge". Basically if a request to -- To view, visit https://gerrit.wikimedia.org/r/378362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e1a20fc7d3186558f3161058e41598eaeeba19d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits