Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cherry pick: Fix template file spacing for ssl_protocols directive (#5020) #5060

Merged
merged 2 commits into from
Feb 9, 2024
Merged

cherry pick: Fix template file spacing for ssl_protocols directive (#5020) #5060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cd0df1
Fix template file spacing for `ssl_protocols` directive (#5020)
j1m-ryan Feb 1, 2024
7c342eb
Merge branch 'release-3.4' into cherry-pick_ssl_protocols
j1m-ryan Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions internal/configs/version1/nginx-plus.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,18 @@ http {
default upgrade;
'' $default_connection_header;
}
{{- if .SSLProtocols}}ssl_protocols {{.SSLProtocols}};{{end}}
{{- if .SSLCiphers}}ssl_ciphers "{{.SSLCiphers}}";{{end}}
{{- if .SSLPreferServerCiphers}}ssl_prefer_server_ciphers on;{{end}}
{{- if .SSLDHParam}}ssl_dhparam {{.SSLDHParam}};{{end}}
{{- if .SSLProtocols}}
ssl_protocols {{.SSLProtocols}};
{{- end}}
{{- if .SSLCiphers}}
ssl_ciphers "{{.SSLCiphers}}";
{{- end}}
{{- if .SSLPreferServerCiphers}}
ssl_prefer_server_ciphers on;
{{- end}}
{{- if .SSLDHParam}}
ssl_dhparam {{.SSLDHParam}};
{{- end}}

{{- if .OpenTracingEnabled}}
opentracing on;
Expand Down
16 changes: 12 additions & 4 deletions internal/configs/version1/nginx.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,18 @@ http {
default upgrade;
'' $default_connection_header;
}
{{- if .SSLProtocols}}ssl_protocols {{.SSLProtocols}};{{end}}
{{- if .SSLCiphers}}ssl_ciphers "{{.SSLCiphers}}";{{end}}
{{- if .SSLPreferServerCiphers}}ssl_prefer_server_ciphers on;{{end}}
{{- if .SSLDHParam}}ssl_dhparam {{.SSLDHParam}};{{end}}
{{- if .SSLProtocols}}
ssl_protocols {{.SSLProtocols}};
{{- end}}
{{- if .SSLCiphers}}
ssl_ciphers "{{.SSLCiphers}}";
{{- end}}
{{- if .SSLPreferServerCiphers}}
ssl_prefer_server_ciphers on;
{{- end}}
{{- if .SSLDHParam}}
ssl_dhparam {{.SSLDHParam}};
{{- end}}

{{- if .OpenTracingEnabled}}
opentracing on;
Expand Down
Loading