diff --git a/app/create_db.py b/app/create_db.py index 21a029f8..7c6b6b8f 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -18,7 +18,7 @@ def default_values(): {'param': 'token_ttl', 'value': '5', 'section': 'main', 'desc': 'TTL for a user token (in days)', 'group': '1'}, {'param': 'tmp_config_path', 'value': '/tmp/', 'section': 'main', - 'desc': 'Path to the directory with SSL certificates. An existing path should be specified as the value of this parameter. The directory must be owned by the user specified in SSH settings.', + 'desc': 'Path to the temporary directory. A valid path should be specified as the value of this parameter. The directory must be owned by the user specified in SSH settings', 'group': '1'}, {'param': 'cert_path', 'value': '/etc/ssl/certs/', 'section': 'main', 'desc': 'Path to SSL dir. Folder owner must be a user which set in the SSH settings. Path must exist', @@ -77,19 +77,17 @@ def default_values(): {'param': 'ldap_port', 'value': '389', 'section': 'ldap', 'desc': 'LDAP port (port 389 or 636 is used by default)', 'group': '1'}, {'param': 'ldap_user', 'value': '', 'section': 'ldap', - 'desc': 'Loging for connecting to LDAP server. Format: user@domain.com', 'group': '1'}, - {'param': 'ldap_password', 'value': '', 'section': 'ldap', 'desc': 'Password to connect to LDAP server', - 'group': '1'}, + 'desc': 'LDAP username. Format: user@domain.com', 'group': '1'}, + {'param': 'ldap_password', 'value': '', 'section': 'ldap', 'desc': 'LDAP password', 'group': '1'}, {'param': 'ldap_base', 'value': '', 'section': 'ldap', 'desc': 'Base domain. Example: dc=domain, dc=com', 'group': '1'}, - {'param': 'ldap_domain', 'value': '', 'section': 'ldap', 'desc': 'LDAP domain for the login', 'group': '1'}, + {'param': 'ldap_domain', 'value': '', 'section': 'ldap', 'desc': 'LDAP domain for logging in', 'group': '1'}, {'param': 'ldap_class_search', 'value': 'user', 'section': 'ldap', 'desc': 'Class for searching the user', 'group': '1'}, {'param': 'ldap_user_attribute', 'value': 'sAMAccountName', 'section': 'ldap', - 'desc': 'User attribute for search', 'group': '1'}, - {'param': 'ldap_search_field', 'value': 'mail', 'section': 'ldap', - 'desc': 'The field for saving the user\'s e-mail address', 'group': '1'}, - {'param': 'ldap_type', 'value': '0', 'section': 'ldap', 'desc': 'Use LDAP (0) or LDAPS (1)', 'group': '1'}, + 'desc': 'Attribute to search users by', 'group': '1'}, + {'param': 'ldap_search_field', 'value': 'mail', 'section': 'ldap', 'desc': 'User\'s email address', 'group': '1'}, + {'param': 'ldap_type', 'value': '0', 'section': 'ldap', 'desc': 'Use LDAPS (1 - yes, 0 - no)', 'group': '1'}, ] try: Setting.insert_many(data_source).on_conflict_ignore().execute() @@ -617,9 +615,9 @@ def update_db_v_5_0_1(**kwargs): def update_db_v_5_1_2(**kwargs): data_source = [ {'param': 'smon_keep_history_range', 'value': '14', 'section': 'monitoring', - 'desc': 'How many days to keep the history for the SMON service', 'group': '1'}, + 'desc': 'Retention period for SMON history', 'group': '1'}, {'param': 'checker_keep_history_range', 'value': '14', 'section': 'monitoring', - 'desc': 'How many days to keep the history for the Checker service', 'group': '1'} + 'desc': 'Retention period for Checker history', 'group': '1'} ] try: @@ -654,7 +652,7 @@ def update_db_v_5_1_3(**kwargs): def update_db_v_5_2_0(**kwargs): try: Setting.insert(param='portscanner_keep_history_range', value=14, section='monitoring', - desc='How many days to keep the history for the Port scanner service').execute() + desc='Retention period for Port scanner history').execute() except Exception as e: if kwargs.get('silent') != 1: if ( diff --git a/app/db_model.py b/app/db_model.py index c3230247..5a995f72 100644 --- a/app/db_model.py +++ b/app/db_model.py @@ -428,11 +428,11 @@ class ServiceSetting(BaseModel): class ActionHistory(BaseModel): - service = CharField() - server_id = IntegerField() - user_id = IntegerField() - action = CharField() - ip = CharField() + service = CharField(null=True) + server_id = IntegerField(null=True) + user_id = IntegerField(null=True) + action = CharField(null=True) + ip = CharField(null=True) date = DateTimeField(default=datetime.now) class Meta: diff --git a/app/overview.py b/app/overview.py index 5d5bfa94..539c1faa 100644 --- a/app/overview.py +++ b/app/overview.py @@ -10,7 +10,6 @@ template = env.get_template('ovw.html') print('Content-type: text/html\n') -# create_db.update_all_silent() funct.check_login() try: @@ -99,7 +98,6 @@ except Exception as e: is_checker_worker = '' is_metrics_worker = '' token = '' - print(str(e)) template = template.render(h2=1, diff --git a/app/sql.py b/app/sql.py index 857ff87b..bf7b578e 100644 --- a/app/sql.py +++ b/app/sql.py @@ -130,10 +130,10 @@ def add_setting_for_new_group(group_id): {'param': 'token_ttl', 'value': '5', 'section': 'main', 'desc': 'TTL for a user token (in days)', 'group': group_id}, {'param': 'tmp_config_path', 'value': '/tmp/', 'section': 'main', - 'desc': 'Path to the directory with SSL certificates. An existing path should be specified as the value of this parameter. The directory must be owned by the user specified in SSH settings.', + 'desc': 'Path to the temporary directory. A valid path should be specified as the value of this parameter. The directory must be owned by the user specified in SSH settings', 'group': group_id}, {'param': 'cert_path', 'value': '/etc/ssl/certs/', 'section': 'main', - 'desc': 'Path to SSL dir. Folder owner must be a user which set in the SSH settings. Path must exist', + 'desc': 'Path to SSL dir. Folder owner must be a user which set in the SSH settings. The path must be valid', 'group': group_id}, {'param': 'local_path_logs', 'value': '/var/log/haproxy.log', 'section': 'logs', 'desc': 'The default local path for saving logs', 'group': group_id}, @@ -179,19 +179,18 @@ def add_setting_for_new_group(group_id): {'param': 'ldap_port', 'value': '389', 'section': 'ldap', 'desc': 'LDAP port (port 389 or 636 is used by default)', 'group': group_id}, {'param': 'ldap_user', 'value': '', 'section': 'ldap', - 'desc': 'Loging for connecting to LDAP server. Format: user@domain.com', 'group': group_id}, - {'param': 'ldap_password', 'value': '', 'section': 'ldap', 'desc': 'Password to connect to LDAP server', - 'group': group_id}, + 'desc': 'LDAP username. Format: user@domain.com', 'group': group_id}, + {'param': 'ldap_password', 'value': '', 'section': 'ldap', 'desc': 'LDAP password', 'group': group_id}, {'param': 'ldap_base', 'value': '', 'section': 'ldap', 'desc': 'Base domain. Example: dc=domain, dc=com', 'group': group_id}, - {'param': 'ldap_domain', 'value': '', 'section': 'ldap', 'desc': 'LDAP domain for the login', 'group': group_id}, + {'param': 'ldap_domain', 'value': '', 'section': 'ldap', 'desc': 'LDAP domain for logging in', 'group': group_id}, {'param': 'ldap_class_search', 'value': 'user', 'section': 'ldap', 'desc': 'Class for searching the user', 'group': group_id}, {'param': 'ldap_user_attribute', 'value': 'sAMAccountName', 'section': 'ldap', - 'desc': 'User attribute for search', 'group': group_id}, + 'desc': 'Attribute to search users by', 'group': group_id}, {'param': 'ldap_search_field', 'value': 'mail', 'section': 'ldap', - 'desc': 'The field for saving the user\'s e-mail address', 'group': group_id}, - {'param': 'ldap_type', 'value': '0', 'section': 'ldap', 'desc': 'Use LDAP (0) or LDAPS (1)', 'group': group_id}, + 'desc': 'User\'s email address', 'group': group_id}, + {'param': 'ldap_type', 'value': '0', 'section': 'ldap', 'desc': 'Use LDAPS (1 - yes, 0 - no)', 'group': group_id}, ] try: diff --git a/app/templates/admin.html b/app/templates/admin.html index 1a01458c..4b3171bf 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -112,7 +112,7 @@ Service Current version - Last version + Latest version Description diff --git a/inc/style.css b/inc/style.css index d4636383..b223387a 100644 --- a/inc/style.css +++ b/inc/style.css @@ -146,7 +146,7 @@ pre { } #logo_footer { float: left; - margin-left: 41%; + margin-left: 37%; } #logo_footer_img { width: 35px;