reenable pg on travis but let it use a basic database.yml

.travis.yml

@@ -9,9 +9,9 @@ rvm:
   - 1.9.2
 
 env:
-  # - DB=postgres BUILD_TYPE=other
+  - DB=postgres BUILD_TYPE=other
   - DB=mysql BUILD_TYPE=other
-  # - DB=postgres BUILD_TYPE=cucumber
+  - DB=postgres BUILD_TYPE=cucumber
   - DB=mysql BUILD_TYPE=cucumber
 
 before_install: 

config/database.yml.example

@@ -37,4 +37,7 @@ integration1:
   database: diaspora_integration1
 integration2:
   <<: *common
-  database: diaspora_integration2
+  database: diaspora_integration2
+postgres_travis: &postgres_travis
+  adapter: postgresql
+  username: postgres

script/ci/before.sh

@@ -23,7 +23,7 @@ sh -e /etc/init.d/xvfb start
 echo "Setting up database.yml for $DB"
 cp config/database.yml.example config/database.yml
 if [ "$DB" = "postgres" ]; then
-  sed -i 's/*mysql/*postgres/' config/database.yml
+  sed -i 's/*mysql/*postgres_travis/' config/database.yml
 fi
 
 # Set up database