diff --git a/stable/artifactory-ha/files/nginx-artifactory-conf.yaml b/stable/artifactory-ha/files/nginx-artifactory-conf.yaml index 9f9f06dbb..609994075 100644 --- a/stable/artifactory-ha/files/nginx-artifactory-conf.yaml +++ b/stable/artifactory-ha/files/nginx-artifactory-conf.yaml @@ -146,4 +146,7 @@ location / { {{- end }} } } +{{- if .Values.nginx.customServerSnippet }} +{{ tpl .Values.nginx.customServerSnippet . }} +{{- end }} } \ No newline at end of file diff --git a/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml b/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml index 97ae5f27b..efb95df32 100644 --- a/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml +++ b/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml @@ -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 }} \ No newline at end of file diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml index d9b5d511e..9d9128113 100644 --- a/stable/artifactory-ha/values.yaml +++ b/stable/artifactory-ha/values.yaml @@ -2038,6 +2038,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