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

v4.5.4.0 

Changelog: https://haproxy-wi.org/changelog.py#4_5_4
pull/260/head
Pavel Loginov 2020-11-26 10:18:51 +06:00
parent a7e40b1dad
commit c880393c43
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/admin.html
View File

@ -85,7 +85,7 @@
</div> </div>
<div id="openvpn"> <div id="openvpn">
{% if openvpn != 'package openvpn3-client is not installed' %} {% if openvpn != '' %}
<table id="openvpn_table" class="overview"> <table id="openvpn_table" class="overview">
<caption><h3>OpenVPN profiles</h3></caption> <caption><h3>OpenVPN profiles</h3></caption>
<tr class="overviewHead"> <tr class="overviewHead">

4
app/users.py
View File

@ -43,15 +43,13 @@ try:
openvpn = '' openvpn = ''
stdout, stderr = funct.subprocess_execute("rpm --query openvpn3-client") stdout, stderr = funct.subprocess_execute("rpm --query openvpn3-client")
if stdout[0] != 'package openvpn3-client is not installed': if stdout[0] != 'package openvpn3-client is not installed' and stderr != '/bin/sh: rpm: command not found':
cmd = "sudo openvpn3 configs-list |grep -E 'ovpn|(^|[^0-9])[0-9]{4}($|[^0-9])' |grep -v net|awk -F\" \" '{print $1}'|awk 'ORS=NR%2?\" \":\"\\n\"'" cmd = "sudo openvpn3 configs-list |grep -E 'ovpn|(^|[^0-9])[0-9]{4}($|[^0-9])' |grep -v net|awk -F\" \" '{print $1}'|awk 'ORS=NR%2?\" \":\"\\n\"'"
openvpn_configs, stderr = funct.subprocess_execute(cmd) openvpn_configs, stderr = funct.subprocess_execute(cmd)
cmd = "sudo openvpn3 sessions-list|grep -E 'Config|Status'|awk -F\":\" '{print $2}'|awk 'ORS=NR%2?\" \":\"\\n\"'| sed 's/^ //g'" cmd = "sudo openvpn3 sessions-list|grep -E 'Config|Status'|awk -F\":\" '{print $2}'|awk 'ORS=NR%2?\" \":\"\\n\"'| sed 's/^ //g'"
cmd = 'echo "client.ovpn Connection, Client connected"'
openvpn_sess, stderr = funct.subprocess_execute(cmd) openvpn_sess, stderr = funct.subprocess_execute(cmd)
openvpn = stdout[0] openvpn = stdout[0]
except Exception: except Exception:
pass pass