Show More
@@ -106,6 +106,7 b' class AdminSystemInfoSettingsView(BaseAp' | |||||
106 | (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')), |
|
106 | (_('RhodeCode Server IP'), val('server')['server_ip'], state('server')), | |
107 | (_('RhodeCode Server ID'), val('server')['server_id'], state('server')), |
|
107 | (_('RhodeCode Server ID'), val('server')['server_id'], state('server')), | |
108 | (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')), |
|
108 | (_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')), | |
|
109 | (_('RhodeCode Certificate'), val('rhodecode_config')['cert_path'], state('rhodecode_config')), | |||
109 | (_('Workers'), val('rhodecode_config')['config']['server:main'].get('workers', '?'), state('rhodecode_config')), |
|
110 | (_('Workers'), val('rhodecode_config')['config']['server:main'].get('workers', '?'), state('rhodecode_config')), | |
110 | (_('Worker Type'), val('rhodecode_config')['config']['server:main'].get('worker_class', 'sync'), state('rhodecode_config')), |
|
111 | (_('Worker Type'), val('rhodecode_config')['config']['server:main'].get('worker_class', 'sync'), state('rhodecode_config')), | |
111 | ('', '', ''), # spacer |
|
112 | ('', '', ''), # spacer |
@@ -570,6 +570,10 b' def rhodecode_config():' | |||||
570 | log.exception('Failed to read .ini file for display') |
|
570 | log.exception('Failed to read .ini file for display') | |
571 | parsed_ini = {} |
|
571 | parsed_ini = {} | |
572 |
|
572 | |||
|
573 | cert_path = os.path.join( | |||
|
574 | os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(path)))), | |||
|
575 | '.rccontrol-profile/etc/ca-bundle.crt') | |||
|
576 | ||||
573 | rhodecode_ini_safe['server:main'] = parsed_ini |
|
577 | rhodecode_ini_safe['server:main'] = parsed_ini | |
574 |
|
578 | |||
575 | blacklist = [ |
|
579 | blacklist = [ | |
@@ -608,7 +612,8 b' def rhodecode_config():' | |||||
608 | rhodecode_ini_safe.pop(k, None) |
|
612 | rhodecode_ini_safe.pop(k, None) | |
609 |
|
613 | |||
610 | # TODO: maybe put some CONFIG checks here ? |
|
614 | # TODO: maybe put some CONFIG checks here ? | |
611 |
return SysInfoRes(value={'config': rhodecode_ini_safe, |
|
615 | return SysInfoRes(value={'config': rhodecode_ini_safe, | |
|
616 | 'path': path, 'cert_path': cert_path}) | |||
612 |
|
617 | |||
613 |
|
618 | |||
614 | def database_info(): |
|
619 | def database_info(): |
General Comments 0
You need to be logged in to leave comments.
Login now