[artifactory] allow custom nginx config files and snippets - #2290
[artifactory] allow custom nginx config files and snippets#2290rufdoSICKAG wants to merge 1 commit into
Conversation
5d41d95 to
7e37365
Compare
|
@rufdoSICKAG Thanks for the PR , Did you get chance to test the PR with proposed solution ? Can you pls share a sample values , so that a test can be added (from our side for this implementation) |
| } | ||
| } | ||
| {{- if .Values.nginx.customServerSnippet }} | ||
| {{ .Values.nginx.customServerSnippet }} |
There was a problem hiding this comment.
For consistency and to allow templating inside the snippet, use {{ tpl .Values.nginx.customServerSnippet . }} ?
|
|
||
| customConfFile: "" | ||
| # custom.conf: | | ||
| # log_format ningxartifactory '$proxy_protocol_addr - $remote_user [$time_local] "$request"'; |
| # custom.conf: | | ||
| # log_format ningxartifactory '$proxy_protocol_addr - $remote_user [$time_local] "$request"'; | ||
| customServerSnippet: "" | ||
| # access_log /dev/stdout ningxartifactory; |
| {{- end }} | ||
| {{- if .Values.nginx.customConfFile }} | ||
| {{ tpl .Values.nginx.customConfFile . | indent 2 }} | ||
| {{ end }} |
There was a problem hiding this comment.
{{ end }} should be {{- end }}
| {{- end }} | ||
| {{- if .Values.nginx.customConfFile }} | ||
| {{ tpl .Values.nginx.customConfFile . | indent 2 }} | ||
| {{ end }} |
There was a problem hiding this comment.
{{ end }} should be {{- end }}
7e37365 to
6ab830b
Compare
|
I made the suggested changes and rebased the branch to the current master |
This allows to add nginx config files and snippets to customize nginx behavior. An example use case would be, adding a config file containing log_formats and refering to one of those log_formats in a snippet setting a custom access_log.
6ab830b to
6ac91a7
Compare
@chukka |
2 participants
This allows to add nginx config files and snippets to customize nginx behavior. An example use case would be, adding a config file containing log_formats and refering to one of those log_formats in a snippet, setting a custom access_log.
PR Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
[artifactory])What this PR does / why we need it:
This allows to add nginx config files and snippets to customize nginx behavior. An example use case would be, adding a config file containing log_formats and refering to one of those log_formats in a snippet, setting a custom access_log.