瀏覽代碼

Closes #71: Allow cross-origine for Google calendar compatibility

Bastien Sevajol (Algoo) 8 年之前
父節點
當前提交
395cf5bd59
共有 3 個文件被更改,包括 12 次插入0 次删除
  1. 1 0
      tracim/development.ini.base
  2. 4 0
      tracim/tracim/config/app_cfg.py
  3. 7 0
      tracim/tracim/lib/daemons.py

+ 1 - 0
tracim/development.ini.base 查看文件

193
 # radicale.server.port = 5232
193
 # radicale.server.port = 5232
194
 # radicale.server.ssl = false
194
 # radicale.server.ssl = false
195
 # radicale.server.filesystem.folder = ~/.config/radicale/collections
195
 # radicale.server.filesystem.folder = ~/.config/radicale/collections
196
+# radicale.server.allow_origin = *
196
 ## url can be extended like http://127.0.0.1:5232/calendar
197
 ## url can be extended like http://127.0.0.1:5232/calendar
197
 ## in this case, you have to create your own proxy behind this url.
198
 ## in this case, you have to create your own proxy behind this url.
198
 # radicale.client.base_url = http://127.0.0.1:5232
199
 # radicale.client.base_url = http://127.0.0.1:5232

+ 4 - 0
tracim/tracim/config/app_cfg.py 查看文件

249
             'radicale.server.filesystem.folder',
249
             'radicale.server.filesystem.folder',
250
             '~/.config/radicale/collections'
250
             '~/.config/radicale/collections'
251
         )
251
         )
252
+        self.RADICALE_SERVER_ALLOW_ORIGIN = tg.config.get(
253
+            'radicale.server.allow_origin',
254
+            '*',
255
+        )
252
 
256
 
253
         self.RADICALE_CLIENT_BASE_URL_TEMPLATE = \
257
         self.RADICALE_CLIENT_BASE_URL_TEMPLATE = \
254
             tg.config.get('radicale.client.base_url', None)
258
             tg.config.get('radicale.client.base_url', None)

+ 7 - 0
tracim/tracim/lib/daemons.py 查看文件

177
         tracim_rights = 'tracim.lib.radicale.rights'
177
         tracim_rights = 'tracim.lib.radicale.rights'
178
         tracim_storage = 'tracim.lib.radicale.storage'
178
         tracim_storage = 'tracim.lib.radicale.storage'
179
         fs_path = cfg.RADICALE_SERVER_FILE_SYSTEM_FOLDER
179
         fs_path = cfg.RADICALE_SERVER_FILE_SYSTEM_FOLDER
180
+        allow_origin = cfg.RADICALE_SERVER_ALLOW_ORIGIN
180
 
181
 
181
         radicale_config.set('auth', 'type', 'custom')
182
         radicale_config.set('auth', 'type', 'custom')
182
         radicale_config.set('auth', 'custom_handler', tracim_auth)
183
         radicale_config.set('auth', 'custom_handler', tracim_auth)
188
         radicale_config.set('storage', 'custom_handler', tracim_storage)
189
         radicale_config.set('storage', 'custom_handler', tracim_storage)
189
         radicale_config.set('storage', 'filesystem_folder', fs_path)
190
         radicale_config.set('storage', 'filesystem_folder', fs_path)
190
 
191
 
192
+        radicale_config.set(
193
+            'header',
194
+            'Access-Control-Allow-Origin',
195
+            allow_origin,
196
+        )
197
+
191
     def _get_server(self):
198
     def _get_server(self):
192
         from tracim.config.app_cfg import CFG
199
         from tracim.config.app_cfg import CFG
193
         cfg = CFG.get_instance()
200
         cfg = CFG.get_instance()