[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 46bccfc21946f027ff81349cf9af33c9564f9b0c

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 46bccfc21946f027ff81349cf9af33c9564f9b0c

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2621 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  46bccfc21946f027ff81349cf9af33c9564f9b0c (commit)
      from  e9c62e37f42cbdf7c071abe6cb12ba81e0f3c123 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 46bccfc21946f027ff81349cf9af33c9564f9b0c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jun 16 11:36:20 2020 +0000

    core146: add openvpn
    
    openvpn was missed in core145 so add it again.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 .../rootfiles/{oldcore/100 => core/146}/filelists/openvpn  |  0
 config/rootfiles/core/146/update.sh                        | 14 ++++++++++++++
 2 files changed, 14 insertions(+)
 copy config/rootfiles/{oldcore/100 => core/146}/filelists/openvpn (100%)

Difference in files:
diff --git a/config/rootfiles/core/146/filelists/openvpn b/config/rootfiles/core/146/filelists/openvpn
new file mode 120000
index 000000000..493f3f7a4
--- /dev/null
+++ b/config/rootfiles/core/146/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/146/update.sh b/config/rootfiles/core/146/update.sh
index da00a387a..c461d556f 100644
--- a/config/rootfiles/core/146/update.sh
+++ b/config/rootfiles/core/146/update.sh
@@ -89,6 +89,8 @@ rm -rf /lib/modules
 # Remove files
 
 # Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 # Extract files
 extract_files
@@ -115,7 +117,19 @@ done
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Enable OpenVPN metrics collection
+sed -E -i /var/ipfire/ovpn/server.conf \
+	-e "/^client-(dis)?connect/d"
+
+cat <<EOF >> /var/ipfire/ovpn/server.conf
+# Log clients connecting/disconnecting
+client-connect "/usr/sbin/openvpn-metrics client-connect"
+client-disconnect "/usr/sbin/openvpn-metrics client-disconnect"
+EOF
+
 # Start services
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
 
 # remove lm_sensor config after collectd was started
 # to reserch sensors at next boot with updated kernel


hooks/post-receive
--
IPFire 2.x development tree