Download as
Browse Code »

Commit 672c41b59a41c378a1b4dfef2d704b86fa92a635

Authored by Jacob Vosmaer
1 parent 46d9a171
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

Remove chef_db_dir because we do not use erchef

Showing 1 changed file with 0 additions and 2 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
  Diff comments   View file @672c41b
@@ -19,7 +19,6 @@ postgresql_dir = node['gitlab']['postgresql']['dir'] @@ -19,7 +19,6 @@ postgresql_dir = node['gitlab']['postgresql']['dir']
19 postgresql_data_dir = node['gitlab']['postgresql']['data_dir'] 19 postgresql_data_dir = node['gitlab']['postgresql']['data_dir']
20 postgresql_data_dir_symlink = File.join(postgresql_dir, "data") 20 postgresql_data_dir_symlink = File.join(postgresql_dir, "data")
21 postgresql_log_dir = node['gitlab']['postgresql']['log_directory'] 21 postgresql_log_dir = node['gitlab']['postgresql']['log_directory']
22 -chef_db_dir = Dir.glob("/opt/gitlab/embedded/service/erchef/lib/chef_db-*").first  
23 22
24 user node['gitlab']['postgresql']['username'] do 23 user node['gitlab']['postgresql']['username'] do
25 system true 24 system true
@@ -144,7 +143,6 @@ sql_user = node['gitlab']['postgresql']['sql_user'] @@ -144,7 +143,6 @@ sql_user = node['gitlab']['postgresql']['sql_user']
144 sql_user_passwd = node['gitlab']['postgresql']['sql_password'] 143 sql_user_passwd = node['gitlab']['postgresql']['sql_password']
145 144
146 execute "#{bin_dir}/psql --port #{pg_port} -d '#{db_name}' -c \"CREATE USER #{sql_user} WITH ENCRYPTED PASSWORD '#{sql_user_passwd}'\"" do 145 execute "#{bin_dir}/psql --port #{pg_port} -d '#{db_name}' -c \"CREATE USER #{sql_user} WITH ENCRYPTED PASSWORD '#{sql_user_passwd}'\"" do
147 - cwd chef_db_dir  
148 user pg_user 146 user pg_user
149 not_if { !pg_helper.is_running? || pg_helper.sql_user_exists? } 147 not_if { !pg_helper.is_running? || pg_helper.sql_user_exists? }
150 end 148 end