From: Guillaume Pellerin Date: Tue, 12 Mar 2019 21:27:33 +0000 (+0100) Subject: Bugfix X-Git-Tag: 1.4.0~3 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=66645f7c46724a62d6571f9b807a4816856a7566;p=teleforma.git Bugfix --- diff --git a/app/settings.py b/app/settings.py index 6ef81992..caf0cdd9 100644 --- a/app/settings.py +++ b/app/settings.py @@ -193,6 +193,11 @@ TELECASTER_RSYNC_SERVER = 'telecaster@jimi.parisson.com:archives/' TELECASTER_RSYNC_LOG = '/var/log/telecaster/rsync.log' TELECASTER_MASTER_SERVER = 'angus.parisson.com' +TELECASTER_LIVE_STREAMING_SERVER = 'stream.parisson.com' +TELECASTER_LIVE_STREAMING_PORT = 443 +TELECASTER_LIVE_ICECAST_STREAMING_PORT = 8000 +TELECASTER_LIVE_STREAM_M_STREAMING_PORT = 8888 + # CRFPA or AE or PRO TELEFORMA_E_LEARNING_TYPE = 'CRFPA' TELEFORMA_GLOBAL_TWEETER = False diff --git a/teleforma/models/core.py b/teleforma/models/core.py index b8ad93a8..123d6918 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -500,6 +500,7 @@ class LiveStream(Model): @property def mount_point(self): # mount_point = self.server.type + mount_point = '' if self.server.type == 'stream-m': mount_point += '/consume/' + self.slug else: