Skip to content

Commit abc53cc

Browse files
aledbfaledbf
authored
Merge pull request #1277 from danielqsj/add-indent
Add indent for nginx.conf
2 parents 528b378 + e9a14cb commit abc53cc

File tree

3 files changed

+194
-194
lines changed

3 files changed

+194
-194
lines changed

‎controllers/nginx/pkg/template/template.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -312,29 +312,29 @@ func buildProxyPass(host string, b interface{}, loc interface{}) string {
312312
bPath := fmt.Sprintf("%s%s", path, "$baseuri")
313313
if len(location.Rewrite.BaseURLScheme) > 0 {
314314
abu = fmt.Sprintf(`subs_filter '<head(.*)>' '<head$1><base href="%v://$http_host%v">' r;
315-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="%v://$http_host%v">' r;
316-
`, location.Rewrite.BaseURLScheme, bPath, location.Rewrite.BaseURLScheme, bPath)
315+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="%v://$http_host%v">' r;
316+
`, location.Rewrite.BaseURLScheme, bPath, location.Rewrite.BaseURLScheme, bPath)
317317
} else {
318318
abu = fmt.Sprintf(`subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host%v">' r;
319-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host%v">' r;
320-
`, bPath, bPath)
319+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host%v">' r;
320+
`, bPath, bPath)
321321
}
322322
}
323323

324324
if location.Rewrite.Target == slash {
325325
// special case redirect to /
326326
// ie /something to /
327327
return fmt.Sprintf(`
328-
rewrite %s(.*) /$1 break;
329-
rewrite %s / break;
330-
proxy_pass %s://%s;
331-
%v`, path, location.Path, proto, upstreamName, abu)
328+
rewrite %s(.*) /$1 break;
329+
rewrite %s / break;
330+
proxy_pass %s://%s;
331+
%v`, path, location.Path, proto, upstreamName, abu)
332332
}
333333

334334
return fmt.Sprintf(`
335-
rewrite %s(.*) %s/$1 break;
336-
proxy_pass %s://%s;
337-
%v`, path, location.Rewrite.Target, proto, upstreamName, abu)
335+
rewrite %s(.*) %s/$1 break;
336+
proxy_pass %s://%s;
337+
%v`, path, location.Rewrite.Target, proto, upstreamName, abu)
338338
}
339339

340340
// default proxy_pass

‎controllers/nginx/pkg/template/template_test.go

+40-40
Original file line numberDiff line numberDiff line change
@@ -44,54 +44,54 @@ var (
4444
"invalid redirect / to /": {"/", "/", "/", "proxy_pass http://upstream-name;", false, ""},
4545
"redirect / to /jenkins": {"/", "/jenkins", "~* /",
4646
`
47-
rewrite /(.*) /jenkins/$1 break;
48-
proxy_pass http://upstream-name;
49-
`, false, ""},
47+
rewrite /(.*) /jenkins/$1 break;
48+
proxy_pass http://upstream-name;
49+
`, false, ""},
5050
"redirect /something to /": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
51-
rewrite /something/(.*) /$1 break;
52-
rewrite /something / break;
53-
proxy_pass http://upstream-name;
54-
`, false, ""},
51+
rewrite /something/(.*) /$1 break;
52+
rewrite /something / break;
53+
proxy_pass http://upstream-name;
54+
`, false, ""},
5555
"redirect /end-with-slash/ to /not-root": {"/end-with-slash/", "/not-root", "~* ^/end-with-slash/(?<baseuri>.*)", `
56-
rewrite /end-with-slash/(.*) /not-root/$1 break;
57-
proxy_pass http://upstream-name;
58-
`, false, ""},
56+
rewrite /end-with-slash/(.*) /not-root/$1 break;
57+
proxy_pass http://upstream-name;
58+
`, false, ""},
5959
"redirect /something-complex to /not-root": {"/something-complex", "/not-root", `~* ^/something-complex\/?(?<baseuri>.*)`, `
60-
rewrite /something-complex/(.*) /not-root/$1 break;
61-
proxy_pass http://upstream-name;
62-
`, false, ""},
60+
rewrite /something-complex/(.*) /not-root/$1 break;
61+
proxy_pass http://upstream-name;
62+
`, false, ""},
6363
"redirect / to /jenkins and rewrite": {"/", "/jenkins", "~* /", `
64-
rewrite /(.*) /jenkins/$1 break;
65-
proxy_pass http://upstream-name;
66-
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/$baseuri">' r;
67-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/$baseuri">' r;
68-
`, true, ""},
64+
rewrite /(.*) /jenkins/$1 break;
65+
proxy_pass http://upstream-name;
66+
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/$baseuri">' r;
67+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/$baseuri">' r;
68+
`, true, ""},
6969
"redirect /something to / and rewrite": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
70-
rewrite /something/(.*) /$1 break;
71-
rewrite /something / break;
72-
proxy_pass http://upstream-name;
73-
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something/$baseuri">' r;
74-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something/$baseuri">' r;
75-
`, true, ""},
70+
rewrite /something/(.*) /$1 break;
71+
rewrite /something / break;
72+
proxy_pass http://upstream-name;
73+
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something/$baseuri">' r;
74+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something/$baseuri">' r;
75+
`, true, ""},
7676
"redirect /end-with-slash/ to /not-root and rewrite": {"/end-with-slash/", "/not-root", `~* ^/end-with-slash/(?<baseuri>.*)`, `
77-
rewrite /end-with-slash/(.*) /not-root/$1 break;
78-
proxy_pass http://upstream-name;
79-
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
80-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
81-
`, true, ""},
77+
rewrite /end-with-slash/(.*) /not-root/$1 break;
78+
proxy_pass http://upstream-name;
79+
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
80+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
81+
`, true, ""},
8282
"redirect /something-complex to /not-root and rewrite": {"/something-complex", "/not-root", `~* ^/something-complex\/?(?<baseuri>.*)`, `
83-
rewrite /something-complex/(.*) /not-root/$1 break;
84-
proxy_pass http://upstream-name;
85-
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
86-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
87-
`, true, ""},
83+
rewrite /something-complex/(.*) /not-root/$1 break;
84+
proxy_pass http://upstream-name;
85+
subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
86+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
87+
`, true, ""},
8888
"redirect /something to / and rewrite with specific scheme": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
89-
rewrite /something/(.*) /$1 break;
90-
rewrite /something / break;
91-
proxy_pass http://upstream-name;
92-
subs_filter '<head(.*)>' '<head$1><base href="http://$http_host/something/$baseuri">' r;
93-
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="http://$http_host/something/$baseuri">' r;
94-
`, true, "http"},
89+
rewrite /something/(.*) /$1 break;
90+
rewrite /something / break;
91+
proxy_pass http://upstream-name;
92+
subs_filter '<head(.*)>' '<head$1><base href="http://$http_host/something/$baseuri">' r;
93+
subs_filter '<HEAD(.*)>' '<HEAD$1><base href="http://$http_host/something/$baseuri">' r;
94+
`, true, "http"},
9595
}
9696
)
9797

0 commit comments

Comments
 (0)