[open-ils-commits] r1359 - ESI-Examples/trunk/tools/eg_dev_squeeze_installer (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2011-04-14 09:41:43 -0400 (Thu, 14 Apr 2011)
New Revision: 1359

Modified:
   ESI-Examples/trunk/tools/eg_dev_squeeze_installer/README
   ESI-Examples/trunk/tools/eg_dev_squeeze_installer/eg_dev_squeeze_installer.sh
Log:
saner pg locale/encoding install-time handling for postgres.  (Gracias, Dan Scott)

Modified: ESI-Examples/trunk/tools/eg_dev_squeeze_installer/README
===================================================================
--- ESI-Examples/trunk/tools/eg_dev_squeeze_installer/README	2011-04-14 12:49:30 UTC (rev 1358)
+++ ESI-Examples/trunk/tools/eg_dev_squeeze_installer/README	2011-04-14 13:41:43 UTC (rev 1359)
@@ -12,8 +12,8 @@
 
 ----------------------------------------------------------
 
-Author: Bill Erickson (erickson at esilibrary.com)
-Copyright: (C) 2009, 2010  Equinox Software Inc.
+Author: Bill Erickson (berick at esilibrary.com)
+Copyright: (C) 2009-2011 Equinox Software Inc.
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License

Modified: ESI-Examples/trunk/tools/eg_dev_squeeze_installer/eg_dev_squeeze_installer.sh
===================================================================
--- ESI-Examples/trunk/tools/eg_dev_squeeze_installer/eg_dev_squeeze_installer.sh	2011-04-14 12:49:30 UTC (rev 1358)
+++ ESI-Examples/trunk/tools/eg_dev_squeeze_installer/eg_dev_squeeze_installer.sh	2011-04-14 13:41:43 UTC (rev 1359)
@@ -15,7 +15,7 @@
 # -----------------------------------------------------------------------
 
 DOJO_VERSION='1.3.3';
-PG_VERSION='9.0'; # TODO: Postgres 9.0
+PG_VERSION='9.0';
 
 # -----------------------------------------------------------------------
 # Change to suit...
@@ -41,15 +41,8 @@
 apt-get -yq dist-upgrade;
 apt-get -yq install vim build-essential psmisc automake ntpdate subversion rsyslog; 
 
-# Install PG
+# Install PG 9 from backports
 apt-get -yq -t squeeze-backports install postgresql-$PG_VERSION postgresql-client-$PG_VERSION postgresql-contrib-$PG_VERSION postgresql-plperl-$PG_VERSION libpq-dev
-# note: using LC_ALL=C above results in template encoding of SQL_ASCII
-echo ""
-echo "This will drop and rebuild Postgres $PG_VERSION cluster 'main'.  Control-c this script if you don't want to lose data.  Enter to continue."
-echo ""
-read X;
-pg_dropcluster --stop $PG_VERSION main
-pg_createcluster --start --encoding=UTF-8 --locale=C $PG_VERSION main
 
 ntpdate pool.ntp.org 
 cp $BASE_DIR/evergreen.ld.conf /etc/ld.so.conf.d/
@@ -159,7 +152,7 @@
 
 # Create the DB
 PG_COMMAND="
-createdb -E UNICODE evergreen;
+createdb -T template0 --lc-ctype=C --lc-collate=C -E UNICODE evergreen;
 createlang plperl   evergreen;
 createlang plperlu  evergreen;
 createlang plpgsql  evergreen;