Radicale config: separate host and prefix to correctly configure caldavzap

tracim/development.ini.base

@@ -209,7 +209,9 @@ email.processing_mode = sync
 # radicale.server.realm_message = Tracim Calendar - Password Required
 ## url can be extended like http://127.0.0.1:5232/calendar
 ## in this case, you have to create your own proxy behind this url.
-# radicale.client.base_url = http://127.0.0.1:5232
+## and update following parameters
+# radicale.client.base_url.host = http://127.0.0.1:5232
+# radicale.client.base_url.prefix = /
 
 ## WSGIDAV
 wsgidav.config_path = wsgidav.conf

tracim/test.ini

@@ -12,7 +12,8 @@ error_email_from = turbogears@localhost
 radicale.server.port = 15232
 radicale.client.port = 15232
 radicale.server.filesystem.folder = /tmp/tracim_tests_radicale_fs
-radicale.client.base_url = http://localhost:15232
+radicale.client.base_url.host = http://localhost:15232
+radicale.client.base_url.prefix = /
 email.notification.activated = false
 
 [server:main]

tracim/tracim/config/app_cfg.py

@@ -286,22 +286,28 @@ class CFG(object):
             'Tracim Calendar - Password Required',
         )
 
-        self.RADICALE_CLIENT_BASE_URL_TEMPLATE = \
-            tg.config.get('radicale.client.base_url', None)
+        self.RADICALE_CLIENT_BASE_URL_HOST = \
+            tg.config.get('radicale.client.base_url.host', None)
 
-        if not self.RADICALE_CLIENT_BASE_URL_TEMPLATE:
-            self.RADICALE_CLIENT_BASE_URL_TEMPLATE = \
-                'http://{0}:{1}'.format(
-                    self.WEBSITE_SERVER_NAME,
-                    self.RADICALE_SERVER_PORT,
-                )
+        self.RADICALE_CLIENT_BASE_URL_PREFIX = \
+            tg.config.get('radicale.client.base_url.prefix', '/')
+        # Ensure finished by '/'
+        if '/' != self.RADICALE_CLIENT_BASE_URL_PREFIX[-1]:
+            self.RADICALE_CLIENT_BASE_URL_PREFIX += '/'
+
+        if not self.RADICALE_CLIENT_BASE_URL_HOST:
             logger.warning(
                 self,
-                'NOTE: Generated radicale.client.base_url parameter with '
-                'followings parameters: website.server_name, '
-                'radicale.server.port -> {0}'
-                .format(self.RADICALE_CLIENT_BASE_URL_TEMPLATE)
+                'Generated radicale.client.base_url.host parameter with '
+                'followings parameters: website.server_name -> {}'
+                .format(self.RADICALE_CLIENT_BASE_URL_HOST)
             )
+            self.RADICALE_CLIENT_BASE_URL_HOST = self.RADICALE_SERVER_PORT
+
+        self.RADICALE_CLIENT_BASE_URL_TEMPLATE = '{}{}'.format(
+            self.RADICALE_CLIENT_BASE_URL_HOST,
+            self.RADICALE_CLIENT_BASE_URL_PREFIX,
+        )
 
         self.USER_AUTH_TOKEN_VALIDITY = int(tg.config.get(
             'user.auth_token.validity',

tracim/tracim/controllers/calendar.py

@@ -36,6 +36,9 @@ class CalendarConfigController(BaseController):
 
     @tg.expose('tracim.templates.calendar.config')
     def index(self):
+        from tracim.config.app_cfg import CFG
+        cfg = CFG.get_instance()
+
         # TODO BS 20160720: S'assurer d'être identifié !
         user = tmpl_context.identity.get('user')
         dictified_current_user = Context(CTX.CURRENT_USER).toDict(user)
@@ -48,7 +51,7 @@ class CalendarConfigController(BaseController):
         workspace_calendar_urls = CalendarManager\
             .get_workspace_readable_calendars_urls_for_user(user)
         base_href_url = \
-            re.sub(r"^http[s]?://", '', CalendarManager.get_base_url())
+            re.sub(r"^http[s]?://", '', cfg.RADICALE_CLIENT_BASE_URL_HOST)
 
         # Template will use User.auth_token, ensure it's validity
         user.ensure_auth_token()

tracim/tracim/lib/daemons.py

@@ -1,4 +1,3 @@
-import logging
 import threading
 from configparser import DuplicateSectionError
 from wsgiref.simple_server import make_server
@@ -231,6 +230,11 @@ class RadicaleDaemon(Daemon):
         radicale_config.set('storage', 'filesystem_folder', fs_path)
 
         radicale_config.set('server', 'realm', realm_message)
+        radicale_config.set(
+            'server',
+            'base_prefix',
+            cfg.RADICALE_CLIENT_BASE_URL_PREFIX,
+        )
 
         try:
             radicale_config.add_section('headers')