Merge branch 'release-v2.0' of github.com:okfn/ckan into release-v2.0

ckan · May 9, 2013 · e167479 · e167479
2 parents 3893188 + 3fe2bdf
commit e167479
Show file tree

Hide file tree

Showing 17 changed files with 747 additions and 623 deletions.
diff --git a/bin/travis-build b/bin/travis-build
@@ -18,7 +18,9 @@ sudo apt-get install solr-jetty postgresql-$PGVERSION
 # Don't require a password to access DB
 sudo sed -i -e 's/ident/trust/g' /etc/postgresql/$PGVERSION/main/pg_hba.conf 
 
-sudo service postgresql reload
+# 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';"
 
 pip install -r pip-requirements.txt --use-mirrors
 pip install -r pip-requirements-test.txt --use-mirrors
@@ -45,9 +47,11 @@ paster --plugin=ckan db init
 # If Postgres >= 9.0, we don't need to use datastore's legacy mode.
 if [ $PGVERSION != '8.4' ]
 then
-  psql -c 'CREATE USER readonlyuser;' -U postgres
-  sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/readonlyuser@\/datastore/' development.ini
-  paster datastore set-permissions postgres
+  psql -c 'CREATE USER datastore_default;' -U postgres
+  sed -i -e 's/.*datastore.read_url.*/ckan.datastore.read_url = postgresql:\/\/datastore_default@\/datastore_test/' test-core.ini
+  paster datastore set-permissions postgres -c test-core.ini
+else
+  sed -i -e 's/.*datastore.read_url.*//' test-core.ini
 fi