Download as
Browse Code »

Commit 46d9a171f7f8993bce119c3ca04719489facd997

Authored by Jacob Vosmaer
1 parent 2bf889e8
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Use GitLab DB setup procedure

Showing 1 changed file with 5 additions and 12 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
  Diff comments   View file @46d9a17
... ... @@ -140,26 +140,19 @@ pg_user = node['gitlab']['postgresql']['username']
140 140 bin_dir = "/opt/gitlab/embedded/bin"
141 141 db_name = "gitlabhq_production"
142 142  
143   -execute "create #{db_name} database" do
144   - command "#{bin_dir}/createdb -T template0 --port #{pg_port} -E UTF-8 #{db_name}"
145   - user pg_user
146   - not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) }
147   - retries 30
148   - # notifies :run, "execute[migrate_database]", :immediately
149   -end
150   -
151 143 sql_user = node['gitlab']['postgresql']['sql_user']
152 144 sql_user_passwd = node['gitlab']['postgresql']['sql_password']
153 145  
154 146 execute "#{bin_dir}/psql --port #{pg_port} -d '#{db_name}' -c \"CREATE USER #{sql_user} WITH ENCRYPTED PASSWORD '#{sql_user_passwd}'\"" do
155 147 cwd chef_db_dir
156 148 user pg_user
157   - notifies :run, "execute[grant #{db_name} privileges]", :immediately
158 149 not_if { !pg_helper.is_running? || pg_helper.sql_user_exists? }
159 150 end
160 151  
161   -execute "grant #{db_name} privileges" do
162   - command "#{bin_dir}/psql --port #{pg_port} -d '#{db_name}' -c \"GRANT ALL PRIVILEGES ON DATABASE #{db_name} TO #{sql_user}\""
  152 +execute "create #{db_name} database" do
  153 + command "#{bin_dir}/createdb -T template0 --port #{pg_port} -E UTF-8 -O #{sql_user} #{db_name}"
163 154 user pg_user
164   - action :nothing
  155 + not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) }
  156 + retries 30
  157 + # notifies :run, "execute[migrate_database]", :immediately
165 158 end
... ...