Commit 448316d2 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'rc-build-33-tidy-duplicate-setting' into 'master'

Prune setting of postgresql['sql_user_password']

Closes gitlab-org/build/team-tasks#33

See merge request gitlab-org/gitlab-ee!3379
parents 1d501f1d fc09d3a7
......@@ -232,7 +232,6 @@ See `START user configuration` section in the next step for required information
postgresql['hot_standby'] = 'on'
postgresql['wal_level'] = 'replica'
postgresql['shared_preload_libraries'] = 'repmgr_funcs'
postgresql['sql_user_password'] = 'POSTGRESQL_PASSWORD_HASH'
# Disable automatic database migrations
gitlab_rails['auto_migrate'] = false
......
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