From e47b0ed0b99746c9bcc04c463a2336d4734426d7 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 23 Jun 2021 03:46:41 +0200 Subject: [PATCH] pin postgres, add prod volumes, fix relative symlink, bump to 2.0 --- docker-compose.yml | 2 +- env/prod.yml | 3 +++ setup.py | 2 +- teleforma/exam/models.py | 2 +- teleforma/exam/templates/exam/script_detail.html | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ad03b4c3..5b1fe771 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - env/debug.env postgres: - image: postgres:11 + image: postgres:13 env_file: - env/debug.env environment: diff --git a/env/prod.yml b/env/prod.yml index 039fb32c..1521e472 100644 --- a/env/prod.yml +++ b/env/prod.yml @@ -10,6 +10,9 @@ services: restart: unless-stopped env_file: - env/prod.env + volumes: + - /mnt/crfpa-videos:/mnt/crfpa-videos + - /mnt/crfpa-scripts:/mnt/crfpa-scripts channels: build: diff --git a/setup.py b/setup.py index 0f6443ac..4a5cd9e0 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( long_description = open('README.rst').read(), author = "Guillaume Pellerin", author_email = "yomguy@parisson.com", - version = '1.3', + version = '2.0', platforms=['OS Independent'], license='CeCILL v2', classifiers = CLASSIFIERS, diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index 5d9d5a2b..b4e3ad74 100755 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -400,7 +400,7 @@ class Script(BaseResource): new_rel = os.sep.join(old_rel_root) + os.sep + str(self.uuid) + ext if not os.path.exists(new_abs): - os.symlink(old_abs, new_abs) + os.symlink(filename + ext, new_abs) if not self.url: self.url = settings.MEDIA_URL + str(new_rel) diff --git a/teleforma/exam/templates/exam/script_detail.html b/teleforma/exam/templates/exam/script_detail.html index 0281e1e0..9ed42ac7 100644 --- a/teleforma/exam/templates/exam/script_detail.html +++ b/teleforma/exam/templates/exam/script_detail.html @@ -50,6 +50,7 @@ {{ script.title }}
+ {% trans "Send a message" %} {% if topic.file %}  {% trans "Topic" %} {% endif %} -- 2.39.5