diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /example_project/local_settings.py.gitlab-ci | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'example_project/local_settings.py.gitlab-ci')
| -rw-r--r-- | example_project/local_settings.py.gitlab-ci | 14 |
1 files changed, 14 insertions, 0 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" |