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

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-12-23 22:27:58 +01:00
parent 30f68903d3 0dc552342b
commit dcbb8e4f41
31 changed files with 10546 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/fifteen/filelists/files
View File

@@ -1,12 +1,14 @@
etc/system-release
etc/issue
etc/rc.d/init.d/network
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/netinternal.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/upnp.cgi
srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/url-filter.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/functions.pl

13
config/rootfiles/core/fifteen/update.sh
View File

@@ -52,11 +52,16 @@ rm -f /etc/rc.d/init.d/networking/red.up/26-xtaccess
# Remove old CGI files
rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
# Generate chains for new firewall
/sbin/iptables -N INPUTFW
/sbin/iptables -N FORWARDFW
/sbin/iptables -N OUTGOINGFW
# Convert firewall configuration
/usr/bin/convert-xtaccess
/usr/bin/convert-outgoingfw
/usr/bin/convert-portfw
/usr/bin/convert-dmz
/usr/sbin/convert-xtaccess
/usr/sbin/convert-outgoingfw
/usr/sbin/convert-portfw
/usr/sbin/convert-dmz
# Remove old firewall configuration files
rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}