[#1337] horrendous pg_port fix

ckan · Nov 25, 2013 · c9a49fd · c9a49fd
1 parent 6ad3282
commit c9a49fd
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies
@@ -21,14 +21,13 @@ sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java
 echo "##### Restart Postgres #####"
 sudo service postgresql restart
 
-echo "##### postgres conf files grep#####"
-sudo grep 543 /etc/postgresql/*/main/*
+PG_PORT=$(grep ^port /etc/postgresql/$PGVERSION/main/postgresql.conf | awk '{print $3}')
 
 echo "##### Setup postgres' users and databases #####"
-sudo -u postgres psql -c "CREATE USER ckan_default WITH PASSWORD 'pass';"
-sudo -u postgres psql -c "CREATE USER datastore_default WITH PASSWORD 'pass';"
-sudo -u postgres psql -c 'CREATE DATABASE ckan_test WITH OWNER ckan_default;'
-sudo -u postgres psql -c 'CREATE DATABASE datastore_test WITH OWNER ckan_default;'
+sudo -u postgres psql -p $PG_PORT -c "CREATE USER ckan_default WITH PASSWORD 'pass';"
+sudo -u postgres psql -p $PG_PORT -c "CREATE USER datastore_default WITH PASSWORD 'pass';"
+sudo -u postgres psql -p $PG_PORT -c 'CREATE DATABASE ckan_test WITH OWNER ckan_default;'
+sudo -u postgres psql -p $PG_PORT -c 'CREATE DATABASE datastore_test WITH OWNER ckan_default;'
 
 echo "##### Install Python requirements #####"
 export PIP_USE_MIRRORS=true