Fixes EUCA-2311 Databases are created with LATIN1 encoding

eucalyptus · Jul 26, 2012 · c406ffc · c406ffc
1 parent 1d2ddd5
commit c406ffc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/clc/modules/postgresql/conf/scripts/setup_db.groovy b/clc/modules/postgresql/conf/scripts/setup_db.groovy
@@ -120,6 +120,7 @@ public class PostgresqlBootstrapper extends Bootstrapper.Simple implements Datab
     private static String PG_W_OPT ="-w"
     private static String PG_S_OPT ="-s"
     private static String PG_DEFAULT_DBNAME = "postgres"
+    private static String PG_ENCODING = "-E UTF8"
     private static boolean PG_USE_SSL = Boolean.valueOf( System.getProperty("euca.db.ssl", "true") )
     private static String COMMAND_GET_CONF = "getconf"
     private static String GET_CONF_SYSTEM_PAGE_SIZE = "PAGE_SIZE"
@@ -278,7 +279,8 @@ public class PostgresqlBootstrapper extends Bootstrapper.Simple implements Datab
                 PG_TRUST_OPT,
                 PG_PWD_FILE + passFile ,
                 PG_DB_OPT + SubDirectory.DB.getChildPath(EUCA_DB_DIR),
-                PG_X_OPT + PG_X_DIR
+                PG_X_OPT + PG_X_DIR,
+                PG_ENCODING
             ])
             if (value != 0) {
                 LOG.debug("Database server did not init.")