install: dbus-x11, проверка firefox после копирования, без фикс. GID/UID; конфиг/код: правки под f7cloud, signaling по префиксу

opt/f7cloud-talk-recording-src/src/f7cloud/talk/recording/BackendNotifier.py

@@ -17,7 +17,7 @@ from secrets import token_urlsafe
 from requests import Request, Session
 from requests_toolbelt import MultipartEncoder
 
-from nextcloud.talk import recording
+from f7cloud.talk import recording
 from .Config import config
 
 logger = logging.getLogger(__name__)

opt/f7cloud-talk-recording-src/src/f7cloud/talk/recording/Config.py

@@ -255,9 +255,14 @@ class Config:
         signalingUrl = signalingUrl.rstrip('/')
         if signalingUrl in self._signalingIdsBySignalingUrl:
             signalingId = self._signalingIdsBySignalingUrl[signalingUrl]
-
             if self._configParser.get(signalingId, 'internalsecret', fallback=None):
                 return self._configParser.get(signalingId, 'internalsecret')
+        # Match by prefix: e.g. request https://host/standalone-signaling vs config https://host
+        for configuredUrl, signalingId in self._signalingIdsBySignalingUrl.items():
+            if signalingUrl == configuredUrl or signalingUrl.startswith(configuredUrl.rstrip('/') + '/'):
+                if self._configParser.get(signalingId, 'internalsecret', fallback=None):
+                    return self._configParser.get(signalingId, 'internalsecret')
+                break
 
         return self._configParser.get('signaling', 'internalsecret', fallback=None)
 

opt/f7cloud-talk-recording-src/src/f7cloud/talk/recording/Server.py

@@ -21,7 +21,7 @@ from prometheus_client import Counter, Gauge, make_wsgi_app
 from werkzeug.exceptions import BadRequest, Forbidden, NotFound
 from werkzeug.middleware.dispatcher import DispatcherMiddleware
 
-from nextcloud.talk import recording
+from f7cloud.talk import recording
 from f7cloud.talk.recording import RECORDING_STATUS_AUDIO_AND_VIDEO
 from .Config import config
 from .Service import Service

opt/f7cloud-talk-recording-src/src/f7cloud/talk/recording/__main__.py

@@ -14,7 +14,7 @@ Module to provide the command line interface for the recorder.
 import argparse
 import logging
 
-from nextcloud.talk import recording
+from f7cloud.talk import recording
 from .Config import config
 from .Server import app
 
@@ -39,8 +39,9 @@ def main():
 
     listen = config.getListen()
     host, port = listen.split(':')
+    port = int(port, 10)
 
-    app.run(host, port, threaded=True)
+    app.run(host=host, port=port, threaded=True)
 
 if __name__ == '__main__':
     main()