##// END OF EJS Templates
cache: make instance_id = * the default and deprecate it...
Mads Kiilerich -
r5534:55ccfc66 default
parent child Browse files
Show More
@@ -280,12 +280,6 b' issue_prefix = #'
280 #issue_server_link_wiki = https://wiki.example.com/{id}
280 #issue_server_link_wiki = https://wiki.example.com/{id}
281 #issue_prefix_wiki = WIKI-
281 #issue_prefix_wiki = WIKI-
282
282
283 ## instance-id prefix
284 ## a prefix key for this instance used for cache invalidation when running
285 ## multiple instances of kallithea, make sure it's globally unique for
286 ## all running kallithea instances. Leave empty if you don't use it
287 instance_id =
288
289 ## alternative return HTTP header for failed authentication. Default HTTP
283 ## alternative return HTTP header for failed authentication. Default HTTP
290 ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with
284 ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with
291 ## handling that. Set this variable to 403 to return HTTPForbidden
285 ## handling that. Set this variable to 403 to return HTTPForbidden
@@ -746,11 +746,6 b' Or if using a dispatcher WSGI script wit'
746 When running apache as root, please make sure it doesn't run Kallithea as
746 When running apache as root, please make sure it doesn't run Kallithea as
747 root, for examply by adding: ``user=www-data group=www-data`` to the configuration.
747 root, for examply by adding: ``user=www-data group=www-data`` to the configuration.
748
748
749 .. note::
750 If running Kallithea in multiprocess mode,
751 make sure you set ``instance_id = *`` in the configuration so each process
752 gets it's own cache invalidation key.
753
754 Example WSGI dispatch script:
749 Example WSGI dispatch script:
755
750
756 .. code-block:: python
751 .. code-block:: python
@@ -38,7 +38,6 b' 3. Scale Kallithea horizontally'
38 scaled horizontally on one (recommended) or multiple machines. In order
38 scaled horizontally on one (recommended) or multiple machines. In order
39 to scale horizontally you need to do the following:
39 to scale horizontally you need to do the following:
40
40
41 - Each instance needs its own .ini file and unique ``instance_id`` set.
42 - Each instance's ``data`` storage needs to be configured to be stored on a
41 - Each instance's ``data`` storage needs to be configured to be stored on a
43 shared disk storage, preferably together with repositories. This ``data``
42 shared disk storage, preferably together with repositories. This ``data``
44 dir contains template caches, sessions, whoosh index and is used for
43 dir contains template caches, sessions, whoosh index and is used for
@@ -278,12 +278,6 b' issue_prefix = #'
278 #issue_server_link_wiki = https://wiki.example.com/{id}
278 #issue_server_link_wiki = https://wiki.example.com/{id}
279 #issue_prefix_wiki = WIKI-
279 #issue_prefix_wiki = WIKI-
280
280
281 <%text>## instance-id prefix</%text>
282 <%text>## a prefix key for this instance used for cache invalidation when running</%text>
283 <%text>## multiple instances of kallithea, make sure it's globally unique for</%text>
284 <%text>## all running kallithea instances. Leave empty if you don't use it</%text>
285 instance_id =
286
287 <%text>## alternative return HTTP header for failed authentication. Default HTTP</%text>
281 <%text>## alternative return HTTP header for failed authentication. Default HTTP</%text>
288 <%text>## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with</%text>
282 <%text>## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with</%text>
289 <%text>## handling that. Set this variable to 403 to return HTTPForbidden</%text>
283 <%text>## handling that. Set this variable to 403 to return HTTPForbidden</%text>
@@ -274,12 +274,6 b' issue_prefix = #'
274 #issue_server_link_wiki = https://wiki.example.com/{id}
274 #issue_server_link_wiki = https://wiki.example.com/{id}
275 #issue_prefix_wiki = WIKI-
275 #issue_prefix_wiki = WIKI-
276
276
277 ## instance-id prefix
278 ## a prefix key for this instance used for cache invalidation when running
279 ## multiple instances of kallithea, make sure it's globally unique for
280 ## all running kallithea instances. Leave empty if you don't use it
281 instance_id =
282
283 ## alternative return HTTP header for failed authentication. Default HTTP
277 ## alternative return HTTP header for failed authentication. Default HTTP
284 ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with
278 ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with
285 ## handling that. Set this variable to 403 to return HTTPForbidden
279 ## handling that. Set this variable to 403 to return HTTPForbidden
@@ -118,7 +118,7 b' def load_environment(global_conf, app_co'
118 config['base_path'] = repos_path
118 config['base_path'] = repos_path
119 set_app_settings(config)
119 set_app_settings(config)
120
120
121 instance_id = kallithea.CONFIG.get('instance_id')
121 instance_id = kallithea.CONFIG.get('instance_id', '*')
122 if instance_id == '*':
122 if instance_id == '*':
123 instance_id = '%s-%s' % (platform.uname()[1], os.getpid())
123 instance_id = '%s-%s' % (platform.uname()[1], os.getpid())
124 kallithea.CONFIG['instance_id'] = instance_id
124 kallithea.CONFIG['instance_id'] = instance_id
@@ -280,12 +280,6 b' issue_prefix = #'
280 #issue_server_link_wiki = https://wiki.example.com/{id}
280 #issue_server_link_wiki = https://wiki.example.com/{id}
281 #issue_prefix_wiki = WIKI-
281 #issue_prefix_wiki = WIKI-
282
282
283 ## instance-id prefix
284 ## a prefix key for this instance used for cache invalidation when running
285 ## multiple instances of kallithea, make sure it's globally unique for
286 ## all running kallithea instances. Leave empty if you don't use it
287 instance_id =
288
289 ## alternative return HTTP header for failed authentication. Default HTTP
283 ## alternative return HTTP header for failed authentication. Default HTTP
290 ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with
284 ## response is 401 HTTPUnauthorized. Currently Mercurial clients have trouble with
291 ## handling that. Set this variable to 403 to return HTTPForbidden
285 ## handling that. Set this variable to 403 to return HTTPForbidden
General Comments 0
You need to be logged in to leave comments. Login now