diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-12 12:27:15 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-12 12:27:15 +0200 |
| commit | 68e25739d0a9c9de3f746aa7645a7680cb26c6dc (patch) | |
| tree | a95ffceeea9573272188bd6f260edcf2a70f95f2 /example_project | |
| parent | 45ff07d64c57efcaa3be35fa5c88a0f3a74cc9f9 (diff) | |
| download | Ishtar-68e25739d0a9c9de3f746aa7645a7680cb26c6dc.tar.bz2 Ishtar-68e25739d0a9c9de3f746aa7645a7680cb26c6dc.zip | |
CI: add configuration file and adapt Makefile and settings
Diffstat (limited to 'example_project')
| -rw-r--r-- | example_project/settings.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index 18a715577..6d984f6e6 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -40,6 +40,18 @@ LOGIN_REDIRECT_URL = "/" + URL_PATH AUTH_PROFILE_MODULE = 'ishtar_common.IshtarUser' ACCOUNT_ACTIVATION_DAYS = 7 +# change this in local_settings +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': 'ishtar', + 'USER': 'ishtar', + 'PASSWORD': 'ishtar', + 'HOST': 'postgis', + 'PORT': '5432', + } +} + # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. @@ -259,10 +271,6 @@ if DEBUG_TOOLBAR: ) DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False} -import sys -if 'test' in sys.argv or 'test_coverage' in sys.argv: - DATABASES['default']['engine'] = 'sqlite3' - if SQL_DEBUG: LOGGING['loggers']['django.db.backends'] = { |