From: Audrey Tang <audreyt@audreyt.org>
Date: Tue, 10 Mar 2015 07:42:06 +0000 (+0800)
Subject: * Set default encoding to UTF8, not SQL_ASCII
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2b09a847f711fa9e8d7fd6a599e07984efa1abf3;p=discourse_docker.git

* Set default encoding to UTF8, not SQL_ASCII

  This is a cleaned-up patch as suggested by @SamSaffron in #119.
---

diff --git a/templates/postgres.9.2.template.yml b/templates/postgres.9.2.template.yml
index 8ddf363..b716877 100644
--- a/templates/postgres.9.2.template.yml
+++ b/templates/postgres.9.2.template.yml
@@ -86,6 +86,11 @@ run:
   - exec: /bin/bash -c 'sudo -u postgres psql discourse <<< "alter schema public owner to discourse;"'
   - exec: /bin/bash -c 'sudo -u postgres psql discourse <<< "create extension if not exists hstore;"'
   - exec: /bin/bash -c 'sudo -u postgres psql discourse <<< "create extension if not exists pg_trgm;"'
+  - exec:
+      stdin: |
+        update pg_database set encoding = pg_char_to_encoding('UTF8') where datname = 'discourse' AND encoding = pg_encoding_to_char('SQL_ASCII');
+      cmd: sudo -u postgres psql discourse
+      raise_on_fail: false
 
   - exec:
       hook: postgres
diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index 21bdfbc..5385bb3 100644
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -182,6 +182,11 @@ run:
   - exec: su postgres -c 'psql template1 -c "create extension if not exists pg_trgm;"'
   - exec: su postgres -c 'psql discourse -c "create extension if not exists hstore;"'
   - exec: su postgres -c 'psql discourse -c "create extension if not exists pg_trgm;"'
+  - exec:
+      stdin: |
+        update pg_database set encoding = pg_char_to_encoding('UTF8') where datname = 'discourse' AND encoding = pg_encoding_to_char('SQL_ASCII');
+      cmd: sudo -u postgres psql discourse
+      raise_on_fail: false
 
   - file:
      path: /var/lib/postgresql/take-database-backup