Commit 6f0afb3cc4ddb5e9eccbaa3a9da708f0df3eaaac
1 parent
2e8fab6b
Exists in
master
and in
17 other branches
Make UTF8 the default encoding for Postgres
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
files/gitlab-cookbooks/gitlab/recipes/postgresql.rb
@@ -86,7 +86,7 @@ else | @@ -86,7 +86,7 @@ else | ||
86 | end | 86 | end |
87 | end | 87 | end |
88 | 88 | ||
89 | -execute "/opt/gitlab/embedded/bin/initdb -D #{postgresql_data_dir}" do | 89 | +execute "/opt/gitlab/embedded/bin/initdb -D #{postgresql_data_dir} -E UTF8" do |
90 | user node['gitlab']['postgresql']['username'] | 90 | user node['gitlab']['postgresql']['username'] |
91 | not_if { File.exists?(File.join(postgresql_data_dir, "PG_VERSION")) } | 91 | not_if { File.exists?(File.join(postgresql_data_dir, "PG_VERSION")) } |
92 | end | 92 | end |
@@ -148,7 +148,7 @@ execute "#{bin_dir}/psql --port #{pg_port} -d template1 -c \"CREATE USER #{sql_u | @@ -148,7 +148,7 @@ execute "#{bin_dir}/psql --port #{pg_port} -d template1 -c \"CREATE USER #{sql_u | ||
148 | end | 148 | end |
149 | 149 | ||
150 | execute "create #{db_name} database" do | 150 | execute "create #{db_name} database" do |
151 | - command "#{bin_dir}/createdb --port #{pg_port} -E UTF-8 -O #{sql_user} #{db_name}" | 151 | + command "#{bin_dir}/createdb --port #{pg_port} -O #{sql_user} #{db_name}" |
152 | user pg_user | 152 | user pg_user |
153 | not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) } | 153 | not_if { !pg_helper.is_running? || pg_helper.database_exists?(db_name) } |
154 | retries 30 | 154 | retries 30 |