engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

system-info: expose the common certificate file path.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-05-04 12:30:42 +02:00
parent 37094cb9b3
commit c19a9fc11a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rhodecode/apps/admin/views/system_info.py
View file

@ -106,6 +106,7 @@ class AdminSystemInfoSettingsView(BaseAppView):
(_('RhodeCode Server IP'), val('server')['server_ip'], state('server')),
(_('RhodeCode Server ID'), val('server')['server_id'], state('server')),
(_('RhodeCode Configuration'), val('rhodecode_config')['path'], state('rhodecode_config')),
(_('RhodeCode Certificate'), val('rhodecode_config')['cert_path'], state('rhodecode_config')),
(_('Workers'), val('rhodecode_config')['config']['server:main'].get('workers', '?'), state('rhodecode_config')),
(_('Worker Type'), val('rhodecode_config')['config']['server:main'].get('worker_class', 'sync'), state('rhodecode_config')),
('', '', ''), # spacer

7
rhodecode/lib/system_info.py
View file

@ -570,6 +570,10 @@ def rhodecode_config():
log.exception('Failed to read .ini file for display')
parsed_ini = {}
cert_path = os.path.join(
os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(path)))),
'.rccontrol-profile/etc/ca-bundle.crt')
rhodecode_ini_safe['server:main'] = parsed_ini
blacklist = [
@ -608,7 +612,8 @@ def rhodecode_config():
rhodecode_ini_safe.pop(k, None)
# TODO: maybe put some CONFIG checks here ?
return SysInfoRes(value={'config': rhodecode_ini_safe, 'path': path})
return SysInfoRes(value={'config': rhodecode_ini_safe,
'path': path, 'cert_path': cert_path})
def database_info():