openvpn: Introduce CCD.

diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 18f4d31972382cb38af90bf0d0cc1730cb46c980..6be9a102a7598252cd358ee484d3f294bf4dd5e3 100644 (file)
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -8,6 +8,7 @@ usr/sbin/openvpn
 var/ipfire/ovpn
 var/ipfire/ovpn/ca
 var/ipfire/ovpn/caconfig
+var/ipfire/ovpn/ccd
 #var/ipfire/ovpn/certs
 var/ipfire/ovpn/certs/index.txt
 var/ipfire/ovpn/certs/serial

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 398e9a78251c64518c7399520e78cd4c7e430036..2b4c1fdd6e50c66baaf9758d823918336105ea24 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -334,6 +334,7 @@ sub writeserverconf {
     print CONF "port $sovpnsettings{'DDEST_PORT'}\n";
     print CONF "script-security 3 system\n";
     print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n";
+    print CONF "client-config-dir /var/ipfire/ovpn/ccd\n";
     print CONF "tls-server\n";
     print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
     print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";

diff --git a/lfs/openvpn b/lfs/openvpn
index 4f10e7afbe8874b384b4aa867efc087d7435cb96..e57aa30bacf2d190c339c5f012af213c0ef78373 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/plugin/down-root && make
        cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
        -mkdir -vp /var/ipfire/ovpn/ca
+       -mkdir -vp /var/ipfire/ovpn/ccd
        -mkdir -vp /var/ipfire/ovpn/crls
        -mkdir -vp /var/ipfire/ovpn/n2nconf
        -mkdir -vp /var/ipfire/ovpn/scripts