Show More
@@ -172,7 +172,7 b' There are several web server options:' | |||||
172 |
|
172 | |||
173 | The web server used by ``gearbox`` is configured in the ``.ini`` file passed |
|
173 | The web server used by ``gearbox`` is configured in the ``.ini`` file passed | |
174 | to it. The entry point for the WSGI application is configured |
|
174 | to it. The entry point for the WSGI application is configured | |
175 |
in ``setup.py`` as ``kallithea.config. |
|
175 | in ``setup.py`` as ``kallithea.config.application:make_app``. | |
176 |
|
176 | |||
177 | - `Apache httpd`_ can serve WSGI applications directly using mod_wsgi_ and a |
|
177 | - `Apache httpd`_ can serve WSGI applications directly using mod_wsgi_ and a | |
178 | simple Python file with the necessary configuration. This is a good option if |
|
178 | simple Python file with the necessary configuration. This is a good option if |
@@ -23,7 +23,7 b' import click' | |||||
23 | import paste.deploy |
|
23 | import paste.deploy | |
24 |
|
24 | |||
25 | import kallithea |
|
25 | import kallithea | |
26 |
import kallithea.config. |
|
26 | import kallithea.config.application | |
27 |
|
27 | |||
28 |
|
28 | |||
29 | # kallithea_cli is usually invoked through the 'kallithea-cli' wrapper script |
|
29 | # kallithea_cli is usually invoked through the 'kallithea-cli' wrapper script | |
@@ -77,7 +77,7 b' def register_command(config_file=False, ' | |||||
77 | logging.config.fileConfig(cp, |
|
77 | logging.config.fileConfig(cp, | |
78 | {'__file__': path_to_ini_file, 'here': os.path.dirname(path_to_ini_file)}) |
|
78 | {'__file__': path_to_ini_file, 'here': os.path.dirname(path_to_ini_file)}) | |
79 | if config_file_initialize_app: |
|
79 | if config_file_initialize_app: | |
80 |
kallithea.config. |
|
80 | kallithea.config.application.make_app(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf) | |
81 | return annotated(*args, **kwargs) |
|
81 | return annotated(*args, **kwargs) | |
82 | return cli_command(runtime_wrapper) |
|
82 | return cli_command(runtime_wrapper) | |
83 | return annotator |
|
83 | return annotator |
@@ -67,7 +67,7 b' def db_create(user, password, email, rep' | |||||
67 | Session().commit() |
|
67 | Session().commit() | |
68 |
|
68 | |||
69 | # initial repository scan |
|
69 | # initial repository scan | |
70 |
kallithea.config. |
|
70 | kallithea.config.application.make_app( | |
71 | kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf) |
|
71 | kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf) | |
72 | added, _ = kallithea.lib.utils.repo2db_mapper(kallithea.model.scm.ScmModel().repo_scan()) |
|
72 | added, _ = kallithea.lib.utils.repo2db_mapper(kallithea.model.scm.ScmModel().repo_scan()) | |
73 | if added: |
|
73 | if added: |
1 | NO CONTENT: file renamed from kallithea/config/middleware.py to kallithea/config/application.py |
|
NO CONTENT: file renamed from kallithea/config/middleware.py to kallithea/config/application.py |
@@ -307,14 +307,14 b' def _hook_environment(repo_path):' | |||||
307 | connect to the database. |
|
307 | connect to the database. | |
308 | """ |
|
308 | """ | |
309 | import paste.deploy |
|
309 | import paste.deploy | |
310 |
import kallithea.config. |
|
310 | import kallithea.config.application | |
311 |
|
311 | |||
312 | extras = get_hook_environment() |
|
312 | extras = get_hook_environment() | |
313 |
|
313 | |||
314 | path_to_ini_file = extras['config'] |
|
314 | path_to_ini_file = extras['config'] | |
315 | kallithea.CONFIG = paste.deploy.appconfig('config:' + path_to_ini_file) |
|
315 | kallithea.CONFIG = paste.deploy.appconfig('config:' + path_to_ini_file) | |
316 | #logging.config.fileConfig(ini_file_path) # Note: we are in a different process - don't use configured logging |
|
316 | #logging.config.fileConfig(ini_file_path) # Note: we are in a different process - don't use configured logging | |
317 |
kallithea.config. |
|
317 | kallithea.config.application.make_app(kallithea.CONFIG.global_conf, **kallithea.CONFIG.local_conf) | |
318 |
|
318 | |||
319 | # fix if it's not a bare repo |
|
319 | # fix if it's not a bare repo | |
320 | if repo_path.endswith(os.sep + '.git'): |
|
320 | if repo_path.endswith(os.sep + '.git'): |
@@ -156,6 +156,6 b' setuptools.setup(' | |||||
156 | kallithea-cli = kallithea.bin.kallithea_cli:cli |
|
156 | kallithea-cli = kallithea.bin.kallithea_cli:cli | |
157 |
|
157 | |||
158 | [paste.app_factory] |
|
158 | [paste.app_factory] | |
159 |
main = kallithea.config. |
|
159 | main = kallithea.config.application:make_app | |
160 | """, |
|
160 | """, | |
161 | ) |
|
161 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now