openvpn: Move verify script out of configuration directory.

diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index ae6d6eee6fc73d8bdb6ddb060830bcc8363e51f9..d1b836a1b4e5f0fd7547bde1d1e1683724541e0e 100644 (file)
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -5,6 +5,7 @@
 usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so
 #usr/lib/openvpn/plugins/openvpn-plugin-down-root.la
 usr/lib/openvpn/plugins/openvpn-plugin-down-root.so
+usr/lib/openvpn/verify
 usr/sbin/openvpn
 #usr/share/doc/openvpn
 #usr/share/doc/openvpn/COPYING
@@ -31,4 +32,3 @@ var/ipfire/ovpn/ovpn-leases.db
 var/ipfire/ovpn/ovpnconfig
 var/ipfire/ovpn/scripts
 var/ipfire/ovpn/settings
-var/ipfire/ovpn/verify

diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
index 46af05486a42a3ec459c5acb02c2e42b9ce6b029..647eb2660ae1a04afa90b5d535672d15d2839ce1 100644 (file)
--- a/config/rootfiles/core/75/filelists/files
+++ b/config/rootfiles/core/75/filelists/files
@@ -1,6 +1,6 @@
 etc/system-release
 etc/issue
 opt/pakfire/lib/functions.pl
+usr/lib/openvpn/verify
 var/ipfire/header.pl
 var/ipfire/langs
-var/ipfire/ovpn/verify

diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh
index 05e2de3e6a6818f21c1c8e6a9fe682af1acb8a01..3fd00fe3bccfde23c5f776ab93add96367c05147 100644 (file)
--- a/config/rootfiles/core/75/update.sh
+++ b/config/rootfiles/core/75/update.sh
@@ -38,6 +38,12 @@ extract_files
 
 # Start services
 
+# Replace path to verify script.
+if [ -r "/var/ipfire/ovpn/server.conf" ]; then
+       sed -e "s@^tls-verify.*@tls-verify /usr/lib/openvpn/verify@g" \
+               -i /var/ipfire/ovpn/server.conf
+fi
+
 # Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 73e610bfdfeaa82783403252cd8d4723dc602290..2f3ac4d55396f94f6b39213b1efa2ea80bb5dff2 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -425,7 +425,7 @@ sub writeserverconf {
     if ($sovpnsettings{DHCP_WINS} ne '') {
        print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n";
     }  
-    print CONF "tls-verify /var/ipfire/ovpn/verify\n";
+    print CONF "tls-verify /usr/lib/openvpn/verify\n";
     print CONF "crl-verify /var/ipfire/ovpn/crls/cacrl.pem\n";
     print CONF "user nobody\n";
     print CONF "group nobody\n";

diff --git a/lfs/openvpn b/lfs/openvpn
index 87daf07ebfaf291067bdfbbec661b3401dd416e1..727d3741f84aae2eeed3c69b1f8cd62628d6d459 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -93,8 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R root:root /var/ipfire/ovpn/scripts
        chown -R nobody:nobody /var/ipfire/ovpn
        chown root.nobody /var/log/ovpnserver.log
-       chmod 755 /var/ipfire/ovpn/verify
        chmod 660 /var/log/ovpnserver.log
        chmod 700 /var/ipfire/ovpn/certs
+       mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
+       chmod 755 /usr/lib/openvpn/verify
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)