From 4d66fe67a6307ba2bd055a0a7c22ceff3b12701a Mon Sep 17 00:00:00 2001
From: Jainish Shah <Jainishshah@yahoo.com>
Date: Fri, 13 Apr 2018 13:03:00 -0700
Subject: [PATCH] [stable/artifactory] Fixed permission issue for TLS secret
 (#4885)

* fixed support for ingress and existingPVC

* Bumped version

* Fixed typo

* Values.nginx.persistence.existingClaim

* Fixed support for k8s 1.9.6

* fixed path

* Check if TLS cert is provided via secret

* bumped version
---
 stable/artifactory/Chart.yaml                      | 2 +-
 stable/artifactory/templates/nginx-deployment.yaml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
index 704ec1432e..c282fb188b 100644
--- a/stable/artifactory/Chart.yaml
+++ b/stable/artifactory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 7.1.1
+version: 7.1.2
 appVersion: 5.10.1
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
diff --git a/stable/artifactory/templates/nginx-deployment.yaml b/stable/artifactory/templates/nginx-deployment.yaml
index 07a3de142a..120e0db927 100644
--- a/stable/artifactory/templates/nginx-deployment.yaml
+++ b/stable/artifactory/templates/nginx-deployment.yaml
@@ -46,6 +46,10 @@ spec:
               - '/bin/sh'
               - '-c'
               - >
+                if [ -f /tmp/ssl/*.crt ]; then
+                rm -rf /var/opt/jfrog/nginx/ssl/example.*;
+                cp -fv /tmp/ssl/* /var/opt/jfrog/nginx/ssl;
+                fi;
                 until [ -f /etc/nginx/conf.d/artifactory.conf ]; do sleep 1; done;
                 sed -i -e 's,proxy_pass .*,proxy_pass     http://{{ template "artifactory.fullname" . }}:{{ .Values.artifactory.externalPort }}/artifactory/;,g' \
                     -e 's,server_name .*,server_name ~(?<repo>.+)\\.{{ template "artifactory.fullname" . }} {{ template "artifactory.fullname" . }};,g' \
@@ -68,7 +72,7 @@ spec:
           mountPath: {{ .Values.nginx.persistence.mountPath | quote }}
         {{- if .Values.nginx.tlsSecretName }}
         - name: ssl-secret-volume
-          mountPath: "/var/opt/jfrog/nginx/ssl"
+          mountPath: "/tmp/ssl"
         {{- end }}
         resources:
 {{ toYaml .Values.nginx.resources | indent 10 }}