Commit 0eef1befc764100cb84f6ba307dbd87f6de776d9

Authored by Jacob Vosmaer
1 parent c65ded05

Hide database password from reconfigure output

The password will still be shown when the database user is created, but
not any more on subsequent runs of `gitlab-ctl reconfigure`.
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
@@ -150,7 +150,8 @@ db_name = "gitlabhq_production" @@ -150,7 +150,8 @@ db_name = "gitlabhq_production"
150 sql_user = node['gitlab']['postgresql']['sql_user'] 150 sql_user = node['gitlab']['postgresql']['sql_user']
151 sql_user_passwd = node['gitlab']['postgresql']['sql_password'] 151 sql_user_passwd = node['gitlab']['postgresql']['sql_password']
152 152
153 -execute "#{bin_dir}/psql --port #{pg_port} -d template1 -c \"CREATE USER #{sql_user} WITH ENCRYPTED PASSWORD '#{sql_user_passwd}'\"" do 153 +execute "create #{sql_user} database user" do
  154 + command "#{bin_dir}/psql --port #{pg_port} -d template1 -c \"CREATE USER #{sql_user} WITH ENCRYPTED PASSWORD '#{sql_user_passwd}'\""
154 user pg_user 155 user pg_user
155 not_if { !pg_helper.is_running? || pg_helper.sql_user_exists? } 156 not_if { !pg_helper.is_running? || pg_helper.sql_user_exists? }
156 end 157 end