Download as
Browse Code »

Commit 3800ffdd6a9bb61ed2b782fb6754f13867968d37

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

Change DB name and related usernames to gitlab

Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @3800ffd
@@ -27,11 +27,11 @@ default['gitlab']['postgresql']['data_dir'] = "/var/opt/gitlab/postgresql/data" @@ -27,11 +27,11 @@ default['gitlab']['postgresql']['data_dir'] = "/var/opt/gitlab/postgresql/data"
27 default['gitlab']['postgresql']['log_directory'] = "/var/log/gitlab/postgresql" 27 default['gitlab']['postgresql']['log_directory'] = "/var/log/gitlab/postgresql"
28 default['gitlab']['postgresql']['svlogd_size'] = 1000000 28 default['gitlab']['postgresql']['svlogd_size'] = 1000000
29 default['gitlab']['postgresql']['svlogd_num'] = 10 29 default['gitlab']['postgresql']['svlogd_num'] = 10
30 -default['gitlab']['postgresql']['username'] = "opscode-pgsql" 30 +default['gitlab']['postgresql']['username'] = "gitlab-psql"
31 default['gitlab']['postgresql']['shell'] = "/bin/sh" 31 default['gitlab']['postgresql']['shell'] = "/bin/sh"
32 default['gitlab']['postgresql']['home'] = "/var/opt/gitlab/postgresql" 32 default['gitlab']['postgresql']['home'] = "/var/opt/gitlab/postgresql"
33 default['gitlab']['postgresql']['user_path'] = "/opt/gitlab/embedded/bin:/opt/gitlab/bin:$PATH" 33 default['gitlab']['postgresql']['user_path'] = "/opt/gitlab/embedded/bin:/opt/gitlab/bin:$PATH"
34 -default['gitlab']['postgresql']['sql_user'] = "opscode_chef" 34 +default['gitlab']['postgresql']['sql_user'] = "gitlab"
35 default['gitlab']['postgresql']['sql_password'] = "snakepliskin" 35 default['gitlab']['postgresql']['sql_password'] = "snakepliskin"
36 default['gitlab']['postgresql']['sql_ro_user'] = "opscode_chef_ro" 36 default['gitlab']['postgresql']['sql_ro_user'] = "opscode_chef_ro"
37 default['gitlab']['postgresql']['sql_ro_password'] = "shmunzeltazzen" 37 default['gitlab']['postgresql']['sql_ro_password'] = "shmunzeltazzen"
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
  Diff comments   View file @3800ffd
@@ -138,7 +138,7 @@ pg_helper = PgHelper.new(node) @@ -138,7 +138,7 @@ pg_helper = PgHelper.new(node)
138 pg_port = node['gitlab']['postgresql']['port'] 138 pg_port = node['gitlab']['postgresql']['port']
139 pg_user = node['gitlab']['postgresql']['username'] 139 pg_user = node['gitlab']['postgresql']['username']
140 bin_dir = "/opt/gitlab/embedded/bin" 140 bin_dir = "/opt/gitlab/embedded/bin"
141 -db_name = "opscode_chef" 141 +db_name = "gitlabhq_production"
142 142
143 execute "create #{db_name} database" do 143 execute "create #{db_name} database" do
144 command "#{bin_dir}/createdb -T template0 --port #{pg_port} -E UTF-8 #{db_name}" 144 command "#{bin_dir}/createdb -T template0 --port #{pg_port} -E UTF-8 #{db_name}"