Rx3/network_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 11 Wiki Activity

- Bug fixes next to Darkstar live testing...

Browse Source 
- Fix .ovpn download file type.
This commit is contained in:
Arnaud G. GIBERT
2026-08-24 16:51:44 +02:00
parent c2de255a0e
commit 3dc7f6bdd5
6 changed files with 43 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/rx3/vpn.bash
View File

@@ -264,11 +264,11 @@ vpn_job_tab_deinit()
do
vpn_job_tab_get "${job_id}"
if [[ "${job_PId}" -gt 0 ]]
if [[ "${job_pid}" -gt 0 ]]
then
log_info "VPN" "Killing : Id: [${job_id}] Name: [${job_name}] PId: [${job_pid}]..."
kill -15 ${job_pid}
kill -15 ${job_pid} || true
fi
done
@@ -339,12 +339,8 @@ vpn_supervisor()
for job_id in ${VPN_JOB_ID_LIST}
do
vpn_job_tab_get "${job_id}"
${DEBUG} kill -0 "${job_pid}" 2>/dev/null
rc=$?
if [[ ${job_pid} == 0 ]] || [[ $rc != 0 ]]
if [[ ${job_pid} == "0" ]] || ! kill -0 "${job_pid}" 2>/dev/null
then
log_info "VPN" "Restarting Cmd: [${job_cmd}]..."
@@ -395,10 +391,7 @@ vpn_jobs_kill()
do
vpn_job_tab_get "${job_id}"
${DEBUG} kill -0 "${job_pid}" 2>/dev/null
rc=$?
if [[ ${job_pid} != 0 ]] && [[ $rc == 0 ]]
if [[ ${job_pid} != 0 ]] && kill -0 "${job_pid}" 2>/dev/null
then
log_info "VPN" "Killing Job Id: [${job_id}] Job_PId: [${job_pid}] Cmd: [${job_cmd}]..."
@@ -477,10 +470,7 @@ vpn_start()
daemon_pid=0
fi
${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null
rc=$?
if [[ "${daemon_pid}" == "0" ]] || [[ $rc != 0 ]]
if [[ "${daemon_pid}" == "0" ]] || ! kill -0 "${daemon_pid}" 2>/dev/null
then
vpn_config_make_all
@@ -519,10 +509,7 @@ vpn_stop()
daemon_pid=0
fi
${DEBUG} kill -0 "${daemon_pid}" 2>/dev/null
rc=$?
if [[ "${daemon_pid}" == "0" ]] || [[ $rc != 0 ]]
if [[ "${daemon_pid}" == "0" ]] || ! kill -0 "${daemon_pid}" 2>/dev/null
then
log_info "VPN" "Daemon already stoped!"
else
@@ -572,10 +559,7 @@ vpn_status()
do
vpn_job_tab_get "${job_id}"
${DEBUG} kill -0 "${job_pid}" 2>/dev/null
rc=$?
if [[ "${job_pid}" == "0" ]] || [[ $rc != 0 ]]
if [[ "${job_pid}" == "0" ]] || ! kill -0 "${job_pid}" 2>/dev/null
then
job_status="Down"
else