From 02c720c1a528c1b92e2f541aa6583d37bad2e7bc Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 9 Apr 2021 14:26:44 +0200 Subject: [PATCH] crem: update paths, email, phpmyadmin env --- app/settings.py | 2 +- docker-compose.yml | 17 ++++------------- env/phpmyadmin.yml | 4 ---- telemeta/pages | 2 +- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/app/settings.py b/app/settings.py index c51139e8..babb945b 100644 --- a/app/settings.py +++ b/app/settings.py @@ -223,7 +223,7 @@ LOGIN_URL = '/login/' LOGIN_REDIRECT_URL = '/desk/lists/' EMAIL_HOST = 'cchum-kvm-telemeta.in2p3.fr' -DEFAULT_FROM_EMAIL = 'root@cchum-kvm-telemeta.in2p3.fr' +DEFAULT_FROM_EMAIL = 'telemeta@cchum-kvm-telemeta.in2p3.fr' EMAIL_SUBJECT_PREFIX = 'Telemeta - CREM' TIMESIDE_DEFAULT_GRAPHER_ID = 'waveform_centroid' diff --git a/docker-compose.yml b/docker-compose.yml index b3b4da56..dc896c99 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ data: - /home/crem/media/export:/srv/media/export - /home/crem/media/results:/srv/media/results - /archive/CREM/media/log:/srv/media/log - - /archive/CREM/tmp:/srv/media/tmp + - /home/crem/media/tmp:/srv/media/tmp - /archive/CREM/media/items:/srv/media/items - /archive/CREM/backup:/srv/backup - ./data/static:/srv/static @@ -68,6 +68,9 @@ app: - broker - db - search + ports: + - "8100:8000" + worker: image: parisson/telemeta:1.6 @@ -81,15 +84,3 @@ worker: - broker - db -nginx: - image: nginx - ports: - - "8001:80" - volumes: - - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf - volumes_from: - - data - links: - - app - - diff --git a/env/phpmyadmin.yml b/env/phpmyadmin.yml index 0fedc944..0b8523ad 100644 --- a/env/phpmyadmin.yml +++ b/env/phpmyadmin.yml @@ -31,8 +31,4 @@ phpmyadmin: environment: - ABSOLUTE_URI=http://localhost:8000/ -nginx: - links: - - phpmyadmin - diff --git a/telemeta/pages b/telemeta/pages index 5928ac9b..16f6409d 160000 --- a/telemeta/pages +++ b/telemeta/pages @@ -1 +1 @@ -Subproject commit 5928ac9b1d840476de47e1f2b94f9f798f77df8c +Subproject commit 16f6409de93d658779a2cc268db5bf2f49a8bf6e -- 2.39.5