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

Merge commit 'origin/master' into next

Browse Source 
Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2011-10-02 21:17:10 +02:00
parent 8fb6ecda94 fa0bb39f77
commit 84aed1ea54
9 changed files with 95 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/53/filelists/apache2 Symbolic link
View File

@@ -0,0 +1 @@
../../../common/apache2

8
config/rootfiles/core/53/filelists/files
View File

@@ -13,15 +13,13 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/routing.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
var/ipfire/langs/de.pl
var/ipfire/langs/en.pl
var/ipfire/langs/es.pl
var/ipfire/langs/fr.pl
var/ipfire/langs/pl.pl
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
var/ipfire/langs/
usr/local/bin/ipsecctrl
usr/local/bin/openvpnctrl
usr/local/bin/vpn-watch
usr/local/bin/rebuildroutes
usr/local/sbin/setup
var/ipfire/main/routing
var/ipfire/menu.d/30-network.menu
opt/pakfire/etc/pakfire.conf

2
config/rootfiles/core/53/update.sh
View File

@@ -36,6 +36,7 @@ done
#Stop services
/etc/init.d/ipsec stop
/etc/init.d/apache stop
#
# Remove old strongswan libs
@@ -65,6 +66,7 @@ sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_r
#
#Start services
/etc/init.d/apache start
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi