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

v5.2.0 

Changelog: https://haproxy-wi.org/changelog.py#5_2
pull/304/head
Pavel Loginov 2021-06-18 13:25:15 +06:00
parent c0212e23d3
commit 91867cfa6f
6 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/funct.py
View File

@ -1280,6 +1280,8 @@ def get_services_status():
status, stderr = subprocess_execute(cmd)
if s != 'roxy-wi-keep_alive':
service_name = s.split('_')[0]
if s == 'grafana-server':
service_name = 'grafana'
else:
service_name = s
cmd = "rpm --query " + service_name + "-* |awk -F\"" + service_name + "\" '{print $2}' |awk -F\".noa\" '{print $1}' |sed 's/-//1' |sed 's/-/./'"

2
app/smon.py
View File

@ -16,7 +16,7 @@ funct.check_login()
try:
user, user_id, role, token, servers = funct.get_users_params()
user_group = funct.get_user_group(id=1)
cmd = "systemctl status smon |grep Active |awk '{print $2}'"
cmd = "systemctl is-active roxy-wi-smon"
smon_status, stderr = funct.subprocess_execute(cmd)
except Exception as e:
pass

1
app/templates/admin.html
View File

@ -93,6 +93,7 @@
<td class="padding10 first-collumn" style="width: 35%;">
Actions
</td>
<td>Version</td>
<td>Description</td>
</tr>
</thead>

5
app/templates/ajax/load_services.html
View File

@ -23,6 +23,11 @@
<span class="service-stop" onclick="confirmAjaxServiceAction('stop', '{{s.0}}')"></span>
</a>
</td>
<td>
{% if s.3 != '* is not installed' %}
{{ s.3 }}
{% endif %}
</td>
<td>
{{ s.2 }}
</td>

38
app/templates/ajax/load_updatehapwi.html
View File

@ -7,14 +7,24 @@
Roxy-WI
</td>
<td>
<b>{{current_ver}}</b>
<b
{% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
title="There is a newer version Roxy-WI"
style="color: var(--red-color)"
{% else %}
title="There is not a newer version Roxy-WI"
style="color: var(--green-color)"
{% endif %}
>
{{current_ver}}
</b>
</td>
<td class="padding10">
<b>{{new_ver}}</b>
</td>
<td>
{% if new_ver_without_dots > current_ver_without_dots and new_ver != "Sorry cannot get current version" %}
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('haproxy-wi')" title="Update Roxy-WI">Update</a>
<a class="ui-button ui-widget ui-corner-all" onclick="updateService('roxy-wi')" title="Update Roxy-WI">Update</a>
{% endif %}
</td>
<td>
@ -28,35 +38,35 @@
{% if s.0 == 'roxy-wi-smon' %}
{% set service_name = 'SMON' %}
{% set service_link = 'smon' %}
{% set desc_link = 'https://haproxy-wi.org/services.py?service=smon' %}
{% set desc_link = 'https://roxy-wi.org/services.py?service=smon' %}
{% if s.3|float < smon_ver|float %}
{% set is_need_update = 1 %}
{% endif %}
{% elif s.0 == 'roxy-wi-checker' %}
{% set service_name = 'Checker' %}
{% set service_link = 'checker' %}
{% set desc_link = 'https://haproxy-wi.org/services.py?service=checker' %}
{% set desc_link = 'https://roxy-wi.org/services.py?service=checker' %}
{% if s.3|float < checker_ver|float %}
{% set is_need_update = 1 %}
{% endif %}
{% elif s.0 == 'roxy-wi-keep_alive' %}
{% set service_name = 'Auto start' %}
{% set service_link = 'auto_start' %}
{% set desc_link = 'https://haproxy-wi.org/services.py?service=auto_start' %}
{% set desc_link = 'https://roxy-wi.org/services.py?service=auto_start' %}
{% if s.3|float < keep_ver|float %}
{% set is_need_update = 1 %}
{% endif %}
{% elif s.0 == 'roxy-wi-metrics' %}
{% set service_name = 'Metrics' %}
{% set service_link = 'metrics' %}
{% set desc_link = 'https://haproxy-wi.org/services.py?service=metrics' %}
{% set desc_link = 'https://roxy-wi.org/services.py?service=metrics' %}
{% if s.3|float < metrics_ver|float %}
{% set is_need_update = 1 %}
{% endif %}
{% elif s.0 == 'roxy-wi-portscanner' %}
{% set service_name = 'Port scanner' %}
{% set service_link = 'portscanner' %}
{% set desc_link = 'https://haproxy-wi.org/services.py?service={{service_link}}' %}
{% set desc_link = 'https://roxy-wi.org/services.py?service={{service_link}}' %}
{% if s.3|float < portscanner_ver|float %}
{% set is_need_update = 1 %}
{% endif %}
@ -66,7 +76,17 @@
</td>
<td>
{% if s.3 != '* is not installed' %}
<b>{{s.3}}</b>
<b
{% if is_need_update %}
title="There is a newer version {{service_name}}"
style="color: var(--red-color)"
{% else %}
title="There is not a newer version {{service_name}}"
style="color: var(--green-color)"
{% endif %}
>
{{s.3}}
</b>
{% endif %}
</td>
<td class="padding10">
@ -91,7 +111,7 @@
{% endif %}
{% else %}
{{service_name}} service is not installed
<a href="https://haproxy-wi.org/services.py?service={{service_link}}#installation" title="{{service_name}} installation" target="_blank" class="link">Read about installation</a>
<a href="https://roxy-wi.org/services.py?service={{service_link}}#installation" title="{{service_name}} installation" target="_blank" class="link">Read about installation</a>
{% endif %}
</td>
<td>

2
index.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>HAProxy-WI</title>
<title>Roxy-WI</title>
<link href="/inc/images/favicon/favicon.ico" rel="icon" type="image/png" />
<link rel="apple-touch-icon" sizes="57x57" href="/inc/images/favicon/inc/images/favicon/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/inc/images/favicon/apple-icon-60x60.png">