diff --git a/app/templates/admin.html b/app/templates/admin.html index 6209d697..e6f28b92 100644 --- a/app/templates/admin.html +++ b/app/templates/admin.html @@ -85,7 +85,7 @@
- {% if openvpn != 'package openvpn3-client is not installed' %} + {% if openvpn != '' %} diff --git a/app/users.py b/app/users.py index e1e1a669..70ee584e 100644 --- a/app/users.py +++ b/app/users.py @@ -43,15 +43,13 @@ try: openvpn = '' 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\"'" 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 = 'echo "client.ovpn Connection, Client connected"' openvpn_sess, stderr = funct.subprocess_execute(cmd) openvpn = stdout[0] - except Exception: pass

OpenVPN profiles