From 1ad2ef178070d8f5e958e3ddc4b44c4cfa90c526 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Mon, 2 May 2016 12:13:04 -0300
Subject: [PATCH] WIP65

---
 .env_dev                | 4 ++--
 .travis.yml             | 3 +--
 sapl/settings_travis.py | 7 ++++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.env_dev b/.env_dev
index d0da226e8..5c28122fb 100644
--- a/.env_dev
+++ b/.env_dev
@@ -1,5 +1,5 @@
-DATABASE_URL = postgresql://sapl:@localhost:5432/sapl
-SECRET_KEY=2j_-c$_8rssj3ijw=!tf$zr6vlee=s5z^w056trow(%t=k2o9_
+DATABASE_URL = postgresql://sapl:@localhost:/sapl
+SECRET_KEY=TravisTest
 DEBUG=False
 EMAIL_USE_TLS = True
 EMAIL_PORT = 587
diff --git a/.travis.yml b/.travis.yml
index 3530712e3..7579e4474 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,9 +17,8 @@ install:
   - pip install --upgrade setuptools
 
 before_script:
-  - sudo service postgresql restart
   - npm install -g bower
-  - cp sapl/settings_travis.py sapl/settings.py
+  - cp .env_dev .env
   - sed -i -e 's/getpass.getuser()/"postgres"/g' sapl/settings.py
   - psql -c 'create database sapl;' -U postgres
   - python manage.py syncdb –migrate –noinput
diff --git a/sapl/settings_travis.py b/sapl/settings_travis.py
index f04105ad6..14952710c 100644
--- a/sapl/settings_travis.py
+++ b/sapl/settings_travis.py
@@ -7,6 +7,7 @@ https://docs.djangoproject.com/en/1.8/topics/settings/
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.8/ref/settings/
 """
+from dj_database_url import parse as db_url
 from unipath import Path
 
 from .temp_suppress_crispy_form_warnings import \
@@ -18,10 +19,10 @@ BASE_DIR = Path(__file__).ancestor(2)
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '!9g1-#la+#(oft(v-y1qhy$jk-2$24pdk69#b_jfqyv!*%a_)t'
+SECRET_KEY = 'TravisTest'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ['*']
 
@@ -180,4 +181,4 @@ SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child(
 # FIXME update cripy-forms and remove this
 # hack to suppress many annoying warnings from crispy_forms
 # see sapl.temp_suppress_crispy_form_warnings
-LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING
\ No newline at end of file
+LOGGING = SUPRESS_CRISPY_FORM_WARNINGS_LOGGING