openvpn: Fix broken paths

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index c0d49bfad48261bc1dc2fd554616afcbc5820ddd..8a36d4bb41c76b180091fccc6ca9421086812789 100644 (file)
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -25,7 +25,7 @@ usr/sbin/openvpn-authenticator
 #usr/share/doc/openvpn/openvpn.8.html
 #usr/share/man/man5/openvpn-examples.5
 #usr/share/man/man8/openvpn.8
-usr/share/openvpn/openssl.cnf
+usr/share/openvpn/ovpn.cnf
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
 var/ipfire/ovpn/ccd

diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files
index 89b92cd1f14394ca2fa8b220c3ec7ec5098db103..d23b4a8381f882cf95c8f8ca04dc180ab39e73d5 100644 (file)
--- a/config/rootfiles/core/186/filelists/files
+++ b/config/rootfiles/core/186/filelists/files
@@ -15,6 +15,6 @@ etc/rc.d/rc6.d/K01grub-btrfsd
 srv/web/ipfire/cgi-bin/vulnerabilities.cgi
 usr/local/bin/ipsec-interfaces
 usr/sbin/unbound-dhcp-leases-bridge
-usr/share/openvpn/openssl.cnf
+usr/share/openvpn/ovpn.cnf
 var/ipfire/header.pl
 var/ipfire/ipblocklist/sources

diff --git a/lfs/openvpn b/lfs/openvpn
index 0704aa438df6e20a83049cc45b9783ca6bedeaa4..b686cc930abf8a2dce695f6192719a8b8250e3ac 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -105,7 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mkdir -pv /usr/share/openvpn
        mv -v /var/ipfire/ovpn/openssl/ovpn.cnf \
                /usr/share/openvpn/
-       rmdir -v /usr/share/openvpn
+       rmdir -v /var/ipfire/ovpn/openssl
 
        # Install authenticator
        install -v -m 755 $(DIR_SRC)/config/ovpn/openvpn-authenticator \