From 508e1e262c00e629398f6b70d404beb83e2d35c4 Mon Sep 17 00:00:00 2001 From: Pavel Loginov Date: Wed, 7 Dec 2022 10:55:21 +0300 Subject: [PATCH] v6.3.1.0 Changelog: https://roxy-wi.org/changelog#6_3_1 --- app/modules/server/ssh.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/modules/server/ssh.py b/app/modules/server/ssh.py index c0df0b05..28866647 100644 --- a/app/modules/server/ssh.py +++ b/app/modules/server/ssh.py @@ -10,11 +10,11 @@ import modules.roxy_wi_tools as roxy_wi_tools form = common.form error_mess = common.error_mess -get_config_var = roxy_wi_tools.GetConfigVar() +get_config = roxy_wi_tools.GetConfigVar() def return_ssh_keys_path(server_ip: str, **kwargs) -> dict: - lib_path = get_config_var.get_config_var('main', 'lib_path') + lib_path = get_config.get_config_var('main', 'lib_path') ssh_settings = {} if kwargs.get('id'): @@ -62,8 +62,7 @@ def create_ssh_cred() -> None: if sql.insert_new_ssh(name, enable, group, username, password): env = Environment(loader=FileSystemLoader('templates/ajax'), autoescape=True) template = env.get_template('/new_ssh.html') - output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), - page=page) + output_from_parsed_template = template.render(groups=sql.select_groups(), sshs=sql.select_ssh(name=name), page=page) print(output_from_parsed_template) roxywi_common.logging('Roxy-WI server', f'A new SSH credentials {name} has created', roxywi=1, login=1) @@ -83,7 +82,7 @@ def upload_ssh_key() -> None: ssh_keys = f'{name}.pem' try: - check_split = name.split('_')[1] + _check_split = name.split('_')[1] split_name = True except Exception: split_name = False @@ -155,4 +154,4 @@ def delete_ssh_key() -> None: os.remove(ssh_key_name) if sql.delete_ssh(sshdel): print("Ok") - roxywi_common.logging('Roxy-WI server', f'The SSH credentials {name} has deleted', roxywi=1, login=1) \ No newline at end of file + roxywi_common.logging('Roxy-WI server', f'The SSH credentials {name} has deleted', roxywi=1, login=1)