Commit 4932cd07 authored by Nick Howitt's avatar Nick Howitt

Separate status log for tcp connection - #13

parent f315d642
Pipeline #67891696 passed with stages
in 10 minutes and 50 seconds
......@@ -5,7 +5,7 @@
/////////////////////////////////////////////////////////////////////////////
$app['basename'] = 'openvpn';
$app['version'] = '2.4.7';
$app['version'] = '2.4.8';
$app['vendor'] = 'ClearFoundation';
$app['packager'] = 'ClearFoundation';
$app['license'] = 'GPLv3';
......
......@@ -104,6 +104,15 @@ for CONFIG in $CONFIGS; do
fi
done
# Update status parameter (gitlab #13)
#------------------------------------------------------
CHECK=`grep '^status /var/lib/openvpn/openvpn-status.log$' /etc/openvpn/clients-tcp.conf`
if [ -n "$CHECK" ] ; then
logger -p local6.notice -t installer "app-openvpn-core - updating status file in /etc/openvpn/clients-tcp.conf"
sed -i -e 's/^status \/var\/lib\/openvpn\/openvpn-status.log$/status \/var\/lib\/openvpn\/openvpn-status-tcp.log/' /etc/openvpn/clients-tcp.conf
fi
# Sync action: updates configuration using clearsync hook
#--------------------------------------------------------
......
Name: app-openvpn
Epoch: 1
Version: 2.4.7
Version: 2.4.8
Release: 1%{dist}
Summary: OpenVPN
License: GPLv3
......@@ -63,7 +63,7 @@ install -D -m 0755 packaging/samba-configuration-event %{buildroot}/var/clearos/
logger -p local6.notice -t installer 'app-openvpn - installing'
%post core
logger -p local6.notice -t installer 'app-openvpn-core - installing'
logger -p local6.notice -t installer 'app-openvpn-api - installing'
if [ $1 -eq 1 ]; then
[ -x /usr/clearos/apps/openvpn/deploy/install ] && /usr/clearos/apps/openvpn/deploy/install
......@@ -80,7 +80,7 @@ fi
%preun core
if [ $1 -eq 0 ]; then
logger -p local6.notice -t installer 'app-openvpn-core - uninstalling'
logger -p local6.notice -t installer 'app-openvpn-api - uninstalling'
[ -x /usr/clearos/apps/openvpn/deploy/uninstall ] && /usr/clearos/apps/openvpn/deploy/uninstall
fi
......
# Tip - if you are using this as a template for configuring other VPNs:
# - the ifconfig-pool-persist file must be unique
# - the port/protocol combination must be unique
# - the status file must be unique
# - different server IPs are recommended
# - don't forget about the firewall
port 1194
......@@ -19,7 +20,7 @@ group nobody
persist-key
persist-tun
ifconfig-pool-persist /var/lib/openvpn/ipp-tcp.txt 120
status /var/lib/openvpn/openvpn-status.log
status /var/lib/openvpn/openvpn-status-tcp.log
plugin /usr/lib64/openvpn/plugins/openvpn-plugin-auth-pam.so openvpn
verb 3
push "dhcp-option DNS 192.168.1.1"
......
# Tip - if you are using this as a template for configuring other VPNs:
# - the ifconfig-pool-persist file must be unique
# - the port/protocol combination must be unique
# - the status file must be unique
# - different server IPs are recommended
# - don't forget about the firewall
port 1194
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment