Commit 4bcd2af1 authored by Jason Plum's avatar Jason Plum

Merge branch 'permit-complex-pass' into 'master'

Quote read passwords in yml files

Closes #1207

See merge request charts/gitlab!717
parents 40cf0a1e 948e840d
Pipeline #51676034 passed with stages
in 41 minutes and 14 seconds
---
title: Quote read passwords in yml files
merge_request: 717
author:
type: fixed
......@@ -16,7 +16,7 @@ data:
:ssl: {{ .ssl }}
:start_tls: {{ .startTls }}
:email: {{ .user }}
:password: <%= File.read("/etc/gitlab/mailroom/password") %>
:password: "<%= File.read("/etc/gitlab/mailroom/password") %>"
:idle_timeout: {{ .idleTimeout }}
:name: {{ .mailbox }}
:delete_after_delivery: true
......
......@@ -14,7 +14,7 @@ data:
database: {{ template "gitlab.psql.database" . }}
pool: 10
username: {{ template "gitlab.psql.username" . }}
password: <%= File.read("/etc/gitlab/postgres/psql-password") %>
password: "<%= File.read("/etc/gitlab/postgres/psql-password") %>"
host: {{ template "gitlab.psql.host" . }}
port: {{ template "gitlab.psql.port" . }}
# load_balancing:
......
......@@ -16,7 +16,7 @@ data:
database: {{ template "gitlab.psql.database" . }}
pool: 10
username: {{ template "gitlab.psql.username" . }}
password: <%= File.read("/etc/gitlab/postgres/psql-password") %>
password: "<%= File.read("/etc/gitlab/postgres/psql-password") %>"
host: {{ template "gitlab.psql.host" . }}
port: {{ template "gitlab.psql.port" . }}
# load_balancing:
......
......@@ -14,7 +14,7 @@ data:
database: {{ template "gitlab.psql.database" . }}
pool: 10
username: {{ template "gitlab.psql.username" . }}
password: <%= File.read("/etc/gitlab/postgres/psql-password") %>
password: "<%= File.read("/etc/gitlab/postgres/psql-password") %>"
host: {{ template "gitlab.psql.host" . }}
port: {{ template "gitlab.psql.port" . }}
{{- include "gitlab.psql.ssl.config" . | indent 6 }}
......
......@@ -16,7 +16,7 @@ data:
database: {{ template "gitlab.psql.database" . }}
pool: 10
username: {{ template "gitlab.psql.username" . }}
password: <%= File.read("/etc/gitlab/postgres/psql-password") %>
password: "<%= File.read("/etc/gitlab/postgres/psql-password") %>"
host: {{ template "gitlab.psql.host" . }}
port: {{ template "gitlab.psql.port" . }}
# load_balancing:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment