Merge branch '1337-travis-postgres-8.4-cleaned'

ckan · Nov 25, 2013 · bd918a8 · bd918a8
2 parents 91f3184 + 1048efa
commit bd918a8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies
@@ -13,12 +13,16 @@ then
 fi
 
 # Install postgres and solr
-# We need this ppa so we can install postgres-8.4
-sudo add-apt-repository -yy ppa:pitti/postgresql
 sudo apt-get update -qq
 sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java:amd64=1.2.2-1
 
-sudo service postgresql reload
+if [ $PGVERSION == '8.4' ]
+then
+  # force postgres to use 5432 as it's port
+  sudo sed -i -e 's/port = 5433/port = 5432/g' /etc/postgresql/8.4/main/postgresql.conf
+fi
+
+sudo service postgresql restart
 
 # Setup postgres' users and databases
 sudo -u postgres psql -c "CREATE USER ckan_default WITH PASSWORD 'pass';"