Browse Source

v6.3.2.0

Changelog: https://roxy-wi.org/changelog#6_3_2
pull/355/head
Pavel Loginov 2 years ago
parent
commit
f189be8a15
  1. 2
      app/modules/service/installation.py
  2. 2
      app/options.py
  3. 6
      app/templates/servers.html

2
app/modules/service/installation.py

@ -50,7 +50,7 @@ def install_haproxy(server_ip: str, **kwargs):
os.system(f"cp scripts/{script} .") os.system(f"cp scripts/{script} .")
if haproxy_ver is None: 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': if proxy is not None and proxy != '' and proxy != 'None':
proxy_serv = proxy proxy_serv = proxy

2
app/options.py

@ -1143,7 +1143,7 @@ if form.getvalue('ssh_cert'):
name = common.checkAjaxInput(form.getvalue('name')) name = common.checkAjaxInput(form.getvalue('name'))
key = form.getvalue('ssh_cert') 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'): if form.getvalue('newtelegram'):
import modules.alerting.alerting as alerting import modules.alerting.alerting as alerting

6
app/templates/servers.html

@ -67,9 +67,9 @@
</td> </td>
<td class="padding10 first-collumn" style="width: 20%;"> <td class="padding10 first-collumn" style="width: 20%;">
{% set values = dict() %} {% 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', {% 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.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.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.6.0-1', required='required') }} {{ select('hapver', values=values, selected='2.7.1-1', required='required') }}
</td> </td>
<td class="padding10 first-collumn"> <td class="padding10 first-collumn">
<select autofocus required name="haproxyaddserv" id="haproxyaddserv"> <select autofocus required name="haproxyaddserv" id="haproxyaddserv">

Loading…
Cancel
Save