webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 19:00:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed update script, added ovpn lease db + settings.

Browse Source 
Besides an error in the update.sh file, openvpn now uses a lease file, to
to be able to "remember" dynamic ips not just for runtime but beyond reboots
or restarts of openvpn.
Also modified rootfiles and cgi as well as lfs.
This commit is contained in:
Marcus Scholz
2009-09-05 13:13:37 +02:00
parent 310a18fab3
commit 7a1fb216e6
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/openvpn
View File

@@ -13,3 +13,4 @@ var/ipfire/ovpn/openssl/ovpn.cnf
var/ipfire/ovpn/ovpnconfig
var/ipfire/ovpn/settings
var/ipfire/ovpn/verify
var/ipfire/ovpn/ovpn-leases.db

12
config/rootfiles/core/31/update.sh
View File

@@ -119,10 +119,20 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
#
# Add "script-security 3 system" to openvpn config
#
if [ ! -s "/var/ipfire/ovpn/server.conf" ]; then
if [ ! -x "/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
grep -q "ipp-persist" /var/ipfire/ovpn/server.conf \
|| echo "ipp-persist /var/ipfire/ovpn/ovpn-leases.db" >> /var/ipfire/ovpn/server.conf
fi
if [ ! -x "/var/ipfire/ovpn/ovpn-leases.db" ]; then
touch /var/ipfire/ovpn/ovpn-leases.db
fi
#
# Delete old lm-sensor modullist...
#

1
html/cgi-bin/ovpnmain.cgi
View File

@@ -320,6 +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 "tls-server\n";
print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n";
print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n";

6
lfs/openvpn
View File

@@ -75,8 +75,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
-mkdir -p /var/ipfire/ovpn/ca
-mkdir -p /var/ipfire/ovpn/crls
-mkdir -vp /var/ipfire/ovpn/ca
-mkdir -vp /var/ipfire/ovpn/crls
touch /var/ipfire/ovpn/ovpn-leases.db
chmod 700 /var/ipfire/ovpn/ovpn-leases.db
chown -R nobody:nobody /var/ipfire/ovpn
chown root.nobody /var/log/ovpnserver.log
chmod 755 /var/ipfire/ovpn/verify