diff --git a/app/modules/service/installation.py b/app/modules/service/installation.py index 1f345057..ab218b90 100644 --- a/app/modules/service/installation.py +++ b/app/modules/service/installation.py @@ -50,7 +50,7 @@ def install_haproxy(server_ip: str, **kwargs): os.system(f"cp scripts/{script} .") if haproxy_ver is None: - haproxy_ver = '2.6.0-1' + haproxy_ver = '2.7.1-1' if proxy is not None and proxy != '' and proxy != 'None': proxy_serv = proxy diff --git a/app/options.py b/app/options.py index 009d6303..818103a6 100644 --- a/app/options.py +++ b/app/options.py @@ -1143,7 +1143,7 @@ if form.getvalue('ssh_cert'): name = common.checkAjaxInput(form.getvalue('name')) key = form.getvalue('ssh_cert') - ssh_mod.upload_ssh_key(user_group, name, key) + ssh_mod.upload_ssh_key(name, user_group, key) if form.getvalue('newtelegram'): import modules.alerting.alerting as alerting diff --git a/app/templates/servers.html b/app/templates/servers.html index 0eb4a8a8..1f0b9c07 100644 --- a/app/templates/servers.html +++ b/app/templates/servers.html @@ -67,9 +67,9 @@ {% set values = dict() %} - {% set values = {'2.0.5-1':'2.0.5-1','2.2.4-1':'2.2.4-1','2.3.0-1':'2.3.0-1','2.3.10-1':'2.3.10-1', - '2.4.0-1':'2.4.0-1','2.4.9-1':'2.4.9-1','2.4.15-1':'2.4.15-1','2.5.1-1':'2.5.1-1','2.6.0-1':'2.6.0-1'} %} - {{ select('hapver', values=values, selected='2.6.0-1', required='required') }} + {% set values = {2.3.0-1':'2.3.0-1','2.3.10-1':'2.3.10-1', '2.4.0-1':'2.4.0-1','2.4.9-1':'2.4.9-1', + '2.4.15-1':'2.4.15-1','2.5.1-1':'2.5.1-1','2.6.0-1':'2.6.0-1','2.7.1-1':'2.7.1-1'} %} + {{ select('hapver', values=values, selected='2.7.1-1', required='required') }}