From b808edb71c5848d318c104f91aa6bb9efdd3a1d4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Aug 2016 14:21:33 +0200 Subject: CI: specific conf for CI - fix DB host --- example_project/local_settings.py.gitlab-ci | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 example_project/local_settings.py.gitlab-ci (limited to 'example_project/local_settings.py.gitlab-ci') diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci new file mode 100644 index 000000000..6c7e5fbba --- /dev/null +++ b/example_project/local_settings.py.gitlab-ci @@ -0,0 +1,12 @@ +DATABASES = { + 'default': { + 'ENGINE': 'django.contrib.gis.db.backends.postgis', + 'NAME': 'ishtar', + 'USER': 'ishtar', + 'PASSWORD': 'ishtar', + 'HOST': 'mdillon-postgis', + 'PORT': '5432', + } +} + +LOGFILE = '/tmp/ishtar.log' -- cgit v1.2.3 From a9d23a7ab5b8a9f9d6cde072c583293f822235fd Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Aug 2016 16:35:07 +0200 Subject: CI: try another postgis image --- .gitlab-ci.yml | 2 +- example_project/local_settings.py.gitlab-ci | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'example_project/local_settings.py.gitlab-ci') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f282410ed..d5e153ab4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ variables: POSTGRES_PASSWORD: "ishtar" services: - - mdillon/postgis:9.1 + - kartoza/postgis:9.1-1.5 master: script: "make test_gitlab" diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci index 6c7e5fbba..7cfe392af 100644 --- a/example_project/local_settings.py.gitlab-ci +++ b/example_project/local_settings.py.gitlab-ci @@ -1,10 +1,10 @@ DATABASES = { 'default': { 'ENGINE': 'django.contrib.gis.db.backends.postgis', - 'NAME': 'ishtar', + 'NAME': 'gis', 'USER': 'ishtar', 'PASSWORD': 'ishtar', - 'HOST': 'mdillon-postgis', + 'HOST': 'kartoza-postgis', 'PORT': '5432', } } -- cgit v1.2.3 From 5e0778a4e5b44fb03d8a4df3ecc1aa6dd0d23d38 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Aug 2016 20:26:05 +0200 Subject: CI: using custom postgis image --- .gitlab-ci.yml | 8 ++++---- example_project/local_settings.py.gitlab-ci | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'example_project/local_settings.py.gitlab-ci') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5e153ab4..c9f8be9c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,12 +6,12 @@ before_script: - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py variables: - POSTGRES_DB: ishtar - POSTGRES_USER: ishtar - POSTGRES_PASSWORD: "ishtar" + POSTGRES_DB: gis + POSTGRES_USER: gis + POSTGRES_PASSWORD: "gis" services: - - kartoza/postgis:9.1-1.5 + - iggdrasil/postgis master: script: "make test_gitlab" diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci index 7cfe392af..4a8d4fb29 100644 --- a/example_project/local_settings.py.gitlab-ci +++ b/example_project/local_settings.py.gitlab-ci @@ -2,9 +2,9 @@ DATABASES = { 'default': { 'ENGINE': 'django.contrib.gis.db.backends.postgis', 'NAME': 'gis', - 'USER': 'ishtar', - 'PASSWORD': 'ishtar', - 'HOST': 'kartoza-postgis', + 'USER': 'gis', + 'PASSWORD': 'gis', + 'HOST': 'iggdrasil-postgis', 'PORT': '5432', } } -- cgit v1.2.3 From d3183ca243377637f84f74862f2b2660a4364198 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 18 Aug 2016 11:53:18 +0200 Subject: CI: fix db host --- .gitlab-ci.yml | 1 - example_project/local_settings.py.gitlab-ci | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'example_project/local_settings.py.gitlab-ci') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87856de9b..e3958c965 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ before_script: - apt-get install -q -y python-pip libpq-dev python-dev libjpeg-dev zlib1g-dev libxml2-dev libxslt1-dev libgeos-dev tidy - pip install -q -r requirements.txt - cp Makefile.example Makefile - - cat /etc/hosts - cp example_project/local_settings.py.gitlab-ci example_project/local_settings.py variables: diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci index 4a8d4fb29..69744da43 100644 --- a/example_project/local_settings.py.gitlab-ci +++ b/example_project/local_settings.py.gitlab-ci @@ -4,7 +4,7 @@ DATABASES = { 'NAME': 'gis', 'USER': 'gis', 'PASSWORD': 'gis', - 'HOST': 'iggdrasil-postgis', + 'HOST': 'iggdrasil-postgis-1.5', 'PORT': '5432', } } -- cgit v1.2.3 From 60c6201602a3541f228a9a4323cda9d33b93e9ea Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 18 Aug 2016 14:35:00 +0200 Subject: Comments --- archaeological_finds/ishtar_menu.py | 2 +- example_project/local_settings.py.gitlab-ci | 2 ++ example_project/local_settings.py.sample | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'example_project/local_settings.py.gitlab-ci') diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py index 8cffe78e4..e31db1bc1 100644 --- a/archaeological_finds/ishtar_menu.py +++ b/archaeological_finds/ishtar_menu.py @@ -49,7 +49,7 @@ MENU_SECTIONS = [ # MenuItem( # 'treatment_creation', _(u"Add a treatment"), # model=models.Treatment, - #  access_controls=['change_find', + # access_controls=['change_find', # 'change_own_find']), MenuItem( 'find_deletion', _(u"Deletion"), diff --git a/example_project/local_settings.py.gitlab-ci b/example_project/local_settings.py.gitlab-ci index 69744da43..7f4bcefa1 100644 --- a/example_project/local_settings.py.gitlab-ci +++ b/example_project/local_settings.py.gitlab-ci @@ -10,3 +10,5 @@ DATABASES = { } 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 -- cgit v1.2.3