cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove sql api related configuration from configure script

Browse Source
This commit is contained in:
Raul Ochoa 2015-09-29 20:00:39 +02:00
parent 6a38defac5
commit 3a92fdd0f3
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -20,7 +20,6 @@
ENVDIR=config/environments ENVDIR=config/environments
PGPORT= PGPORT=
SQLAPI_PORT=
MAPNIK_VERSION= MAPNIK_VERSION=
ENVIRONMENT=development ENVIRONMENT=development
@ -32,7 +31,6 @@ usage() {
echo "Configuration:" echo "Configuration:"
echo " --help display this help and exit" echo " --help display this help and exit"
echo " --with-pgport=NUM access PostgreSQL server on TCP port NUM [$PGPORT]" 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 " --with-mapnik-version=STRING set mapnik version string [$MAPNIK_VERSION]"
echo " --environment=STRING set output environment name [$ENVIRONMENT]" echo " --environment=STRING set output environment name [$ENVIRONMENT]"
} }
@ -46,9 +44,6 @@ while test -n "$1"; do
--with-pgport=*) --with-pgport=*)
PGPORT=`echo "$1" | cut -d= -f2` PGPORT=`echo "$1" | cut -d= -f2`
;; ;;
--with-sqlapi-port=*)
SQLAPI_PORT=`echo "$1" | cut -d= -f2`
;;
--with-mapnik-version=*) --with-mapnik-version=*)
MAPNIK_VERSION=`echo "$1" | cut -d= -f2` MAPNIK_VERSION=`echo "$1" | cut -d= -f2`
;; ;;
@ -67,12 +62,8 @@ ENVEX=./${ENVDIR}/${ENVIRONMENT}.js.example
if [ -z "$PGPORT" ]; then if [ -z "$PGPORT" ]; then
PGPORT=`node -e "console.log(require('${ENVEX}').postgres.port)"` PGPORT=`node -e "console.log(require('${ENVEX}').postgres.port)"`
fi fi
if [ -z "$SQLAPI_PORT" ]; then
SQLAPI_PORT=`node -e "console.log(require('${ENVEX}').sqlapi.port)"`
fi
echo "PGPORT: $PGPORT" echo "PGPORT: $PGPORT"
echo "SQLAPI_PORT: $SQLAPI_PORT"
echo "MAPNIK_VERSION: $MAPNIK_VERSION" echo "MAPNIK_VERSION: $MAPNIK_VERSION"
echo "ENVIRONMENT: $ENVIRONMENT" echo "ENVIRONMENT: $ENVIRONMENT"
@ -82,7 +73,6 @@ echo "Writing $o"
# See http://austinmatzko.com/2008/04/26/sed-multi-line-search-and-replace/ # 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 -n "1h;1!H;\${;g;s/\(,postgres: {[^}]*port: *'\?\)[^',]*\('\?,\)/\1$PGPORT\2/;p;}" < "${ENVEX}" \
| sed "s/mapnik_version:.*/mapnik_version: '$MAPNIK_VERSION'/" \ | sed "s/mapnik_version:.*/mapnik_version: '$MAPNIK_VERSION'/" \
| sed -n "1h;1!H;\${;g;s/\(,sqlapi: {[^}]*port: *'\?\)[^',]*\('\?,\)/\1$SQLAPI_PORT\2/;p;}" \
> "$o" > "$o"
STATUSFILE=config.status--${ENVIRONMENT} STATUSFILE=config.status--${ENVIRONMENT}