diff options
Diffstat (limited to 'example_project')
-rw-r--r-- | example_project/local_settings.py.gitlab-ci | 14 | ||||
-rw-r--r-- | example_project/local_settings.py.sample | 2 | ||||
-rw-r--r-- | example_project/settings.py | 17 |
3 files changed, 28 insertions, 5 deletions
diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci new file mode 100644 index 000000000..7f4bcefa1 --- /dev/null +++ b/example_project/local_settings.py.gitlab-ci @@ -0,0 +1,14 @@ +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': 'gis', + 'USER': 'gis', + 'PASSWORD': 'gis', + 'HOST': 'iggdrasil-postgis-1.5', + 'PORT': '5432', + } +} + +LOGFILE = '/tmp/ishtar.log' + +PROJECT_SLUG = "CI-instance" diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample index ee5338801..5a7550d9a 100644 --- a/example_project/local_settings.py.sample +++ b/example_project/local_settings.py.sample @@ -34,7 +34,7 @@ DEBUG_TOOLBAR = False TEMPLATE_DEBUG = DEBUG SQL_DEBUG = False -# important to change on a server hosting multiple ishtar instances +# very important to change on a server hosting multiple ishtar instances PROJECT_SLUG = "my-project" # complete with host/domain names that this website can serve diff --git a/example_project/settings.py b/example_project/settings.py index 18a715577..9d3a9b46b 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': '127.0.0.1', + '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. @@ -129,6 +141,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django.contrib.formtools', 'django.contrib.messages', + 'django.contrib.humanize', 'south', 'registration', # 'geodjangofla', @@ -259,10 +272,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'] = { |