From 2a71acd71d145a2f15c25964762d1ff39c4fea9a Mon Sep 17 00:00:00 2001 From: Angelos Tzotsos Date: Tue, 15 Dec 2015 13:24:26 +0200 Subject: [PATCH] Upgrade to PostgreSQL 9.4 and PostGIS 2.2 --- bin/install_postgis.sh | 4 ++-- bin/load_postgis.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/install_postgis.sh b/bin/install_postgis.sh index f8049febb..c01c16ecf 100755 --- a/bin/install_postgis.sh +++ b/bin/install_postgis.sh @@ -28,7 +28,7 @@ USER_HOME="/home/$USER_NAME" # Not to be confused with PGIS_Version, this has one less number and period # to correspond to install paths -PG_VERSION="9.3" +PG_VERSION="9.4" #debug: echo "#DEBUG The locale settings are currently:" @@ -45,7 +45,7 @@ locale echo "------------------------------------" ##-- TODO pgdg repo ? -apt-get install --yes postgis "postgresql-$PG_VERSION-postgis-2.1" +apt-get install --yes postgis "postgresql-$PG_VERSION-postgis-2.2" #TODO: Restore postgis-gui in the future. if [ $? -ne 0 ] ; then diff --git a/bin/load_postgis.sh b/bin/load_postgis.sh index 55c2f6d0d..23aee0493 100755 --- a/bin/load_postgis.sh +++ b/bin/load_postgis.sh @@ -71,13 +71,13 @@ sudo -u $POSTGRES_USER psql osm_local -c 'create extension postgis;' # Kosmo, gpsdrive, please update your API calls .... cp "$BUILD_DIR"/../app-conf/postgis/legacy*.sql \ - /usr/share/postgresql/9.3/contrib/postgis-2.1/ + /usr/share/postgresql/9.4/contrib/postgis-2.2/ -sed -i -e 's/postgis-2.0/postgis-2.1/' \ - /usr/share/postgresql/9.3/contrib/postgis-2.1/legacy*.sql +sed -i -e 's/postgis-2.0/postgis-2.2/' \ + /usr/share/postgresql/9.4/contrib/postgis-2.2/legacy*.sql sudo -u $POSTGRES_USER psql osm_local \ - -f /usr/share/postgresql/9.3/contrib/postgis-2.1/legacy_minimal.sql + -f /usr/share/postgresql/9.4/contrib/postgis-2.2/legacy_minimal.sql #sudo -u $POSTGRES_USER createdb osm_local_smerc #sudo -u $POSTGRES_USER psql osm_local_smerc -c 'create extension postgis;'