From 3a92fdd0f38b52a4d04d180cd61b3eaa37fbb92e Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 29 Sep 2015 20:00:39 +0200 Subject: [PATCH] Remove sql api related configuration from configure script --- configure | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure b/configure index 052a3502..c234f6f4 100755 --- a/configure +++ b/configure @@ -20,7 +20,6 @@ ENVDIR=config/environments PGPORT= -SQLAPI_PORT= MAPNIK_VERSION= ENVIRONMENT=development @@ -32,7 +31,6 @@ usage() { echo "Configuration:" echo " --help display this help and exit" echo " --with-pgport=NUM access PostgreSQL server on TCP port NUM [$PGPORT]" - echo " --with-sqlapi-port=NUM access SQL-API server on TCP port NUM [$SQLAPI_PORT]" echo " --with-mapnik-version=STRING set mapnik version string [$MAPNIK_VERSION]" echo " --environment=STRING set output environment name [$ENVIRONMENT]" } @@ -46,9 +44,6 @@ while test -n "$1"; do --with-pgport=*) PGPORT=`echo "$1" | cut -d= -f2` ;; - --with-sqlapi-port=*) - SQLAPI_PORT=`echo "$1" | cut -d= -f2` - ;; --with-mapnik-version=*) MAPNIK_VERSION=`echo "$1" | cut -d= -f2` ;; @@ -67,12 +62,8 @@ ENVEX=./${ENVDIR}/${ENVIRONMENT}.js.example if [ -z "$PGPORT" ]; then PGPORT=`node -e "console.log(require('${ENVEX}').postgres.port)"` fi -if [ -z "$SQLAPI_PORT" ]; then - SQLAPI_PORT=`node -e "console.log(require('${ENVEX}').sqlapi.port)"` -fi echo "PGPORT: $PGPORT" -echo "SQLAPI_PORT: $SQLAPI_PORT" echo "MAPNIK_VERSION: $MAPNIK_VERSION" echo "ENVIRONMENT: $ENVIRONMENT" @@ -82,7 +73,6 @@ echo "Writing $o" # See http://austinmatzko.com/2008/04/26/sed-multi-line-search-and-replace/ sed -n "1h;1!H;\${;g;s/\(,postgres: {[^}]*port: *'\?\)[^',]*\('\?,\)/\1$PGPORT\2/;p;}" < "${ENVEX}" \ | sed "s/mapnik_version:.*/mapnik_version: '$MAPNIK_VERSION'/" \ - | sed -n "1h;1!H;\${;g;s/\(,sqlapi: {[^}]*port: *'\?\)[^',]*\('\?,\)/\1$SQLAPI_PORT\2/;p;}" \ > "$o" STATUSFILE=config.status--${ENVIRONMENT}