DB_LOCALE config parameter renamed to PG_LOCALE

This commit is contained in:
Sameer Naik
2015-11-27 14:47:04 +05:30
parent 5e09110558
commit ce2caf3937
4 changed files with 9 additions and 6 deletions
+4 -4
View File
@@ -25,9 +25,9 @@ map_uidgid() {
}
locale_gen() {
if [[ $DB_LOCALE != C ]]; then
echo "Generating locale \"${DB_LOCALE}\"..."
locale-gen ${DB_LOCALE} >/dev/null
if [[ $PG_LOCALE != C ]]; then
echo "Generating locale \"${PG_LOCALE}\"..."
locale-gen ${PG_LOCALE} >/dev/null
fi
}
@@ -203,7 +203,7 @@ initialize_database() {
fi
exec_as_postgres ${PG_BINDIR}/initdb --pgdata=${PG_DATADIR} \
--username=${PG_USER} --encoding=unicode --locale=${DB_LOCALE} --auth=trust >/dev/null
--username=${PG_USER} --encoding=unicode --locale=${PG_LOCALE} --auth=trust >/dev/null
if [[ -n ${PG_OLD_VERSION} ]]; then
PG_OLD_BINDIR=/usr/lib/postgresql/${PG_OLD_VERSION}/bin