github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v7.0.0.0 

Changelog: https://roxy-wi.org/changelog#7.0.0
pull/364/head
Aidaho 2023-09-18 14:13:37 +03:00
parent 7421d16c92
commit 0f07635324
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/roxywi/common.py
View File

@ -202,7 +202,7 @@ def get_dick_permit(**kwargs):
except Exception as e: except Exception as e:
return str(e) return str(e)
else: else:
group_id = kwargs.get('group_id') group_id = kwargs.pop('group_id')
if check_user_group_for_flask(token=token): if check_user_group_for_flask(token=token):
try: try:

18
app/modules/roxywi/roxy.py
View File

@ -50,8 +50,10 @@ def update_roxy_wi(service):
cmd = f'sudo -S yum -y install {service} {restart_service}' cmd = f'sudo -S yum -y install {service} {restart_service}'
output, stderr = server_mod.subprocess_execute(cmd) output, stderr = server_mod.subprocess_execute(cmd)
return output if stderr:
# print(stderr) return stderr
else:
return output
def check_ver(): def check_ver():
@ -64,12 +66,6 @@ def versions():
current_ver_without_dots = current_ver.split('.') current_ver_without_dots = current_ver.split('.')
current_ver_without_dots = ''.join(current_ver_without_dots) current_ver_without_dots = ''.join(current_ver_without_dots)
current_ver_without_dots = current_ver_without_dots.replace('\n', '') current_ver_without_dots = current_ver_without_dots.replace('\n', '')
if len(current_ver_without_dots) == 2:
current_ver_without_dots += '00'
if len(current_ver_without_dots) == 3:
current_ver_without_dots += '0'
if len(current_ver_without_dots) == 7:
current_ver_without_dots += '0'
current_ver_without_dots = int(current_ver_without_dots) current_ver_without_dots = int(current_ver_without_dots)
except Exception: except Exception:
current_ver = "Sorry cannot get current version" current_ver = "Sorry cannot get current version"
@ -80,12 +76,6 @@ def versions():
new_ver_without_dots = new_ver.split('.') new_ver_without_dots = new_ver.split('.')
new_ver_without_dots = ''.join(new_ver_without_dots) new_ver_without_dots = ''.join(new_ver_without_dots)
new_ver_without_dots = new_ver_without_dots.replace('\n', '') new_ver_without_dots = new_ver_without_dots.replace('\n', '')
if len(new_ver_without_dots) == 2:
new_ver_without_dots += '00'
if len(new_ver_without_dots) == 3:
new_ver_without_dots += '0'
if len(new_ver_without_dots) == 7:
new_ver_without_dots += '0'
new_ver_without_dots = int(new_ver_without_dots) new_ver_without_dots = int(new_ver_without_dots)
except Exception as e: except Exception as e:
new_ver = "Cannot get a new version" new_ver = "Cannot get a new version"

2
app/templates/login.html
View File

@ -62,8 +62,6 @@ body, .container {
<img src="{{ url_for('static', filename='images/logo_login.png')}}"> <img src="{{ url_for('static', filename='images/logo_login.png')}}">
</span> </span>
<form class="form-horizontal" id="auth" method="post" style="margin-top: 60px;left: 0;float: left;margin-left: 93px;"> <form class="form-horizontal" id="auth" method="post" style="margin-top: 60px;left: 0;float: left;margin-left: 93px;">
<span style="color: white;font-weight: bold;padding-left: 10px;">Login/Password admin/admin</span>
<br>
<div class="fontuser"> <div class="fontuser">
{{ input('login', class='form-login', placeholder=lang.words.login|title(), required='required', autofocus='autofocus') }} {{ input('login', class='form-login', placeholder=lang.words.login|title(), required='required', autofocus='autofocus') }}
<i class="fa fa-user fa-lg"></i> <i class="fa fa-user fa-lg"></i>

2
inc/users.js
View File

@ -2737,7 +2737,7 @@ function updateKeepalivedCheckerSettings(id) {
url: "/app/checker/settings/update", url: "/app/checker/settings/update",
data: { data: {
service: 'keepavlied', service: 'keepavlied',
settings_id: id, setting_id: id,
email: email, email: email,
server: server, server: server,
backend: backend, backend: backend,