Merge remote-tracking branch 'origin/master' into fifteen

diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
index 647eb2660ae1a04afa90b5d535672d15d2839ce1..460db7dedb7ed4f75ac984bda58a9b28128a4bd3 100644 (file)
--- a/config/rootfiles/core/75/filelists/files
+++ b/config/rootfiles/core/75/filelists/files
@@ -1,6 +1,7 @@
 etc/system-release
 etc/issue
 opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 usr/lib/openvpn/verify
 var/ipfire/header.pl
 var/ipfire/langs

diff --git a/lfs/openvpn b/lfs/openvpn
index 727d3741f84aae2eeed3c69b1f8cd62628d6d459..053d5819861e21180507d8d793ba2615aeb9b026 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -96,6 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chmod 660 /var/log/ovpnserver.log
        chmod 700 /var/ipfire/ovpn/certs
        mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
+       chown root:root /usr/lib/openvpn/verify
        chmod 755 /usr/lib/openvpn/verify
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)