From 07675dc397e8359160492573120b728129aefb52 Mon Sep 17 00:00:00 2001 From: Marcus Scholz Date: Sun, 6 Sep 2009 13:51:21 +0200 Subject: [PATCH] Fixed syntax of persist option for ovpn 2.1. --- config/rootfiles/core/31/update.sh | 6 +++--- html/cgi-bin/ovpnmain.cgi | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/31/update.sh b/config/rootfiles/core/31/update.sh index 48afaa9bdc..1c9c9a129b 100644 --- a/config/rootfiles/core/31/update.sh +++ b/config/rootfiles/core/31/update.sh @@ -125,13 +125,13 @@ if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then fi if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then - grep -q "ipp-persist" /var/ipfire/ovpn/server.conf \ - || echo "ipp-persist /var/ipfire/ovpn/ovpn-leases.db" >> /var/ipfire/ovpn/server.conf + grep -q "ifconfig-pool-persist" /var/ipfire/ovpn/server.conf \ + || echo "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600" >> /var/ipfire/ovpn/server.conf fi if [ ! -x "/var/ipfire/ovpn/ovpn-leases.db" ]; then touch /var/ipfire/ovpn/ovpn-leases.db - chmod 700 /var/ipfire/ovpn/ovpn-leases.db + chmod 600 /var/ipfire/ovpn/ovpn-leases.db chown nobody:nobody /var/ipfire/ovpn/ovpn-leases.db fi # diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index b982ee99ae..3bbcf1ca16 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -320,7 +320,7 @@ sub writeserverconf { print CONF "proto $sovpnsettings{'DPROTOCOL'}\n"; print CONF "port $sovpnsettings{'DDEST_PORT'}\n"; print CONF "script-security 3 system\n"; - print CONF "ipp-persist /var/ipfire/ovpn/ovpn-leases.db\n"; + print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\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"; -- 2.39.2