Skip to content

[artifactory] allow custom nginx config files and snippets #2290

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

Open
rufdoSICKAG wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[artifactory] allow custom nginx config files and snippets #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions stable/artifactory-ha/files/nginx-artifactory-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,7 @@ location / {
{{- end }}
}
}
{{- if .Values.nginx.customServerSnippet }}
{{ tpl .Values.nginx.customServerSnippet . }}
{{- end }}
}
3 changes: 3 additions & 0 deletions stable/artifactory-ha/templates/nginx-artifactory-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ data:
{{- else }}
{{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }}
{{- end }}
{{- if .Values.nginx.customConfFile }}
{{ tpl .Values.nginx.customConfFile . | indent 2 }}
{{- end }}
{{- end }}
6 changes: 6 additions & 0 deletions stable/artifactory-ha/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1947,6 +1947,12 @@ nginx:
## allows overwriting the command for the nginx container.
## defaults to [ 'nginx', '-g', 'daemon off;' ]

customConfFile: ""
# custom.conf: |
# log_format nginxartifactory '$proxy_protocol_addr - $remote_user [$time_local] "$request"';
customServerSnippet: ""
# access_log /dev/stdout nginxartifactory;

service:
## For minikube, set this to NodePort, elsewhere use LoadBalancer
type: LoadBalancer
Expand Down
3 changes: 3 additions & 0 deletions stable/artifactory/files/nginx-artifactory-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,7 @@ location / {
{{- end }}
}
}
{{- if .Values.nginx.customServerSnippet }}
{{ tpl .Values.nginx.customServerSnippet . }}
{{- end }}
}
3 changes: 3 additions & 0 deletions stable/artifactory/templates/nginx-artifactory-conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ data:
{{- else }}
{{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }}
{{- end }}
{{- if .Values.nginx.customConfFile }}
{{ tpl .Values.nginx.customConfFile . | indent 2 }}
{{- end }}
{{- end }}
6 changes: 6 additions & 0 deletions stable/artifactory/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,6 +1851,12 @@ nginx:
## allows overwriting the command for the nginx container.
## defaults to [ 'nginx', '-g', 'daemon off;' ]

customConfFile: ""
# custom.conf: |
# log_format ningxartifactory '$proxy_protocol_addr - $remote_user [$time_local] "$request"';
customServerSnippet: ""
# access_log /dev/stdout ningxartifactory;

service:
## For minikube, set this to NodePort, elsewhere use LoadBalancer
type: LoadBalancer
Expand Down
Loading