Created
July 22, 2019 17:58
-
-
Save rckclmbr/a17b945278e18a2ff8cf4715e7a6634f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jbraeg-mbp:magma jbraeg$ git diff | |
diff --git a/orc8r/cloud/helm/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl b/orc8r/cloud/helm/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl | |
index d7c01459..995f50f8 100644 | |
--- a/orc8r/cloud/helm/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl | |
+++ b/orc8r/cloud/helm/orc8r/charts/nms/templates/etc/_nginx_proxy_ssl.conf.tpl | |
@@ -3,6 +3,7 @@ server { | |
ssl on; | |
ssl_certificate /etc/nginx/conf.d/nms_nginx.pem; | |
ssl_certificate_key /etc/nginx/conf.d/nms_nginx.key.pem; | |
+ ssl_password_file /etc/nginx/conf.d/nms_nginx.password; | |
location / { | |
proxy_pass http://magmalte:8081; | |
} | |
diff --git a/orc8r/cloud/helm/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml b/orc8r/cloud/helm/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml | |
index b217fade..55d445ac 100644 | |
--- a/orc8r/cloud/helm/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml | |
+++ b/orc8r/cloud/helm/orc8r/charts/nms/templates/nginx-proxy-deployment.yaml | |
@@ -69,6 +69,10 @@ spec: | |
mountPath: /etc/nginx/conf.d/nms_nginx.key.pem | |
subPath: {{ .Values.nginx.deployment.spec.ssl_cert_key_name }} | |
readOnly: true | |
+ - name: orc8r-secrets-certs | |
+ mountPath: /etc/nginx/conf.d/nms_nginx.password | |
+ subPath: {{ .Values.nginx.deployment.spec.ssl_password_file }} | |
+ readOnly: true | |
volumes: | |
- name: nginx-proxy-etc | |
configMap: | |
diff --git a/orc8r/cloud/helm/orc8r/charts/nms/values.yaml b/orc8r/cloud/helm/orc8r/charts/nms/values.yaml | |
index 1d0fbb03..80c67942 100644 | |
--- a/orc8r/cloud/helm/orc8r/charts/nms/values.yaml | |
+++ b/orc8r/cloud/helm/orc8r/charts/nms/values.yaml | |
@@ -79,6 +79,7 @@ nginx: | |
spec: | |
ssl_cert_name: nms_nginx.pem | |
ssl_cert_key_name: nms_nginx.key.pem | |
+ ssl_password_file: nms_nginx.password | |
tolerations: [] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment