From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 7 Oct 2009 21:35:25 +0000 (+0200)
Subject: Fix openvpn server config
X-Git-Tag: v2.5-core31
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=dd4b2bf02e928f87cbb7db335fe7a95de2990a5e

Fix openvpn server config
---

diff --git a/config/rootfiles/core/31/update.sh b/config/rootfiles/core/31/update.sh
index 87cc519236..8267b615f7 100644
--- a/config/rootfiles/core/31/update.sh
+++ b/config/rootfiles/core/31/update.sh
@@ -123,17 +123,19 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 # Add some entries to openvpn config
 #
-if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then
+if [ -e "/var/ipfire/ovpn/server.conf" ]; then
 	grep -q "script-security" /var/ipfire/ovpn/server.conf \
 	|| echo "script-security 3 system" >> /var/ipfire/ovpn/server.conf
 fi
 
-if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then
+if [ -e "/var/ipfire/ovpn/server.conf" ]; then
 	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
+	chmod 644 /var/ipfire/ovpn/server.conf
+	chown nobody:nobody /var/ipfire/ovpn/server.conf
 
-if [ ! -x "/var/ipfire/ovpn/ovpn-leases.db" ]; then
+if [ ! -e "/var/ipfire/ovpn/ovpn-leases.db" ]; then
 	touch /var/ipfire/ovpn/ovpn-leases.db
 	chmod 600 /var/ipfire/ovpn/ovpn-leases.db
 	chown nobody:nobody /var/ipfire/ovpn/ovpn-leases.db