diff --git a/site-modules/profile/templates/varnish/vhost.vcl.erb b/site-modules/profile/templates/varnish/vhost.vcl.erb --- a/site-modules/profile/templates/varnish/vhost.vcl.erb +++ b/site-modules/profile/templates/varnish/vhost.vcl.erb @@ -7,9 +7,9 @@ sub vcl_recv { if ( <% @aliases.each do |alias_| -%> - req.http.host ~ "^(?i)<%= Regexp.escape(alias_) %>$" || + req.http.host ~ "^(?i)<%= Regexp.escape(alias_) %>(:[0-9]+)?$" || <% end -%> - req.http.host ~ "^(?i)<%= Regexp.escape(@servername) %>$" + req.http.host ~ "^(?i)<%= Regexp.escape(@servername) %>(:[0-9]+)?$" ) { if (std.port(server.ip) == <%= scope['::profile::varnish::http_port'] %>) { set req.http.x-redir = "https://" + req.http.host + req.url; @@ -28,9 +28,9 @@ sub vcl_deliver { if ( <% @aliases.each do |alias_| -%> - req.http.host ~ "^(?i)<%= Regexp.escape(alias_) %>$" || + req.http.host ~ "^(?i)<%= Regexp.escape(alias_) %>(:[0-9]+)?$" || <% end -%> - req.http.host ~ "^(?i)<%= Regexp.escape(@servername) %>$" + req.http.host ~ "^(?i)<%= Regexp.escape(@servername) %>(:[0-9]+)?$" ) { <% if @hsts_max_age -%> if (std.port(server.ip) != <%= scope['::profile::varnish::http_port'] %>) {