diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
index 943c43631..fc0dd678a 100644
--- a/controllers/nginx/pkg/template/template.go
+++ b/controllers/nginx/pkg/template/template.go
@@ -323,12 +323,12 @@ func buildProxyPass(host string, b interface{}, loc interface{}) string {
// path has a slash suffix, so that it can be connected with baseuri directly
bPath := fmt.Sprintf("%s%s", path, "$baseuri")
if len(location.Rewrite.BaseURLScheme) > 0 {
- abu = fmt.Sprintf(`subs_filter '
' '' r;
- subs_filter '' '' r;
+ abu = fmt.Sprintf(`subs_filter '' '' r;
+ subs_filter '' '' r;
`, location.Rewrite.BaseURLScheme, bPath, location.Rewrite.BaseURLScheme, bPath)
} else {
- abu = fmt.Sprintf(`subs_filter '' '' r;
- subs_filter '' '' r;
+ abu = fmt.Sprintf(`subs_filter '' '' r;
+ subs_filter '' '' r;
`, bPath, bPath)
}
}
diff --git a/controllers/nginx/pkg/template/template_test.go b/controllers/nginx/pkg/template/template_test.go
index 62d0342f4..2c054720b 100644
--- a/controllers/nginx/pkg/template/template_test.go
+++ b/controllers/nginx/pkg/template/template_test.go
@@ -64,34 +64,34 @@ var (
"redirect / to /jenkins and rewrite": {"/", "/jenkins", "~* /", `
rewrite /(.*) /jenkins/$1 break;
proxy_pass http://upstream-name;
- subs_filter '' '' r;
- subs_filter '' '' r;
+ subs_filter '' '' r;
+ subs_filter '' '' r;
`, true, ""},
"redirect /something to / and rewrite": {"/something", "/", `~* ^/something\/?(?.*)`, `
rewrite /something/(.*) /$1 break;
rewrite /something / break;
proxy_pass http://upstream-name;
- subs_filter '' '' r;
- subs_filter '' '' r;
+ subs_filter '' '' r;
+ subs_filter '' '' r;
`, true, ""},
"redirect /end-with-slash/ to /not-root and rewrite": {"/end-with-slash/", "/not-root", `~* ^/end-with-slash/(?.*)`, `
rewrite /end-with-slash/(.*) /not-root/$1 break;
proxy_pass http://upstream-name;
- subs_filter '' '' r;
- subs_filter '' '' r;
+ subs_filter '' '' r;
+ subs_filter '' '' r;
`, true, ""},
"redirect /something-complex to /not-root and rewrite": {"/something-complex", "/not-root", `~* ^/something-complex\/?(?.*)`, `
rewrite /something-complex/(.*) /not-root/$1 break;
proxy_pass http://upstream-name;
- subs_filter '' '' r;
- subs_filter '' '' r;
+ subs_filter '' '' r;
+ subs_filter '' '' r;
`, true, ""},
"redirect /something to / and rewrite with specific scheme": {"/something", "/", `~* ^/something\/?(?.*)`, `
rewrite /something/(.*) /$1 break;
rewrite /something / break;
proxy_pass http://upstream-name;
- subs_filter '' '' r;
- subs_filter '' '' r;
+ subs_filter '' '' r;
+ subs_filter '' '' r;
`, true, "http"},
}
)