Merge branch 'master' into 30-application-security-gateway

# Conflicts: # passbook/core/policies.py # passbook/core/settings.py
2019-03-21 14:58:10 +01:00
parent 6be8d0cbb2 1c3b5889e5
commit 10b7d99b37
37 changed files with 221 additions and 56 deletions
--- a/helm/passbook/templates/passbook-configmap.yaml
+++ b/helm/passbook/templates/passbook-configmap.yaml
@ -37,6 +37,7 @@ data:
    secure_proxy_header:
      HTTP_X_FORWARDED_PROTO: https
    rabbitmq: "user:{{ .Values.rabbitmq.rabbitmq.password }}@{{ .Release.Name }}-rabbitmq"
+    redis: ":{{ .Values.redis.password }}@{{ .Release.Name }}-redis-master/0"
    # Error reporting, sends stacktrace to sentry.services.beryju.org
    error_report_enabled: {{ .Values.config.error_reporting }}