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

Merge remote-tracking branch 'stevee/core-76-update' into next

Browse Source
This commit is contained in:
Michael Tremer
2014-01-28 20:49:32 +01:00
parent 73372ed4e6 5bdefccbbc
commit 7ab6a8536c
2 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/rootfiles/core/76/filelists/firewall
View File

@@ -9,19 +9,19 @@ usr/sbin/convert-outgoingfw
usr/sbin/convert-portfw
usr/sbin/convert-xtaccess
usr/sbin/firewall-policy
var/ipfire/firewall
#var/ipfire/firewall
var/ipfire/firewall/bin/firewall-lib.pl
var/ipfire/firewall/bin/rules.pl
var/ipfire/firewall/config
var/ipfire/firewall/input
var/ipfire/firewall/outgoing
var/ipfire/firewall/p2protocols
var/ipfire/firewall/settings
var/ipfire/fwhosts
var/ipfire/fwhosts/customhosts
var/ipfire/fwhosts/customnetworks
var/ipfire/fwhosts/customgroups
var/ipfire/fwhosts/customservices
var/ipfire/fwhosts/customservicegrp
#var/ipfire/firewall/config
#var/ipfire/firewall/input
#var/ipfire/firewall/outgoing
#var/ipfire/firewall/p2protocols
#var/ipfire/firewall/settings
#var/ipfire/fwhosts
#var/ipfire/fwhosts/customhosts
#var/ipfire/fwhosts/customnetworks
#var/ipfire/fwhosts/customgroups
#var/ipfire/fwhosts/customservices
#var/ipfire/fwhosts/customservicegrp
var/ipfire/fwhosts/icmp-types
var/ipfire/menu.d/50-firewall.menu

20
config/rootfiles/core/76/update.sh
View File

@@ -192,6 +192,10 @@ fi
ln -svf ../run /var/run
# Creating directories for new firewall.
mkdir -p /var/ipfire/firewall
mkdir -p /var/ipfire/fwhosts
#
#Extract files
tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
@@ -253,6 +257,22 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
/sbin/iptables -t nat -N NAT_SOURCE 2>/dev/null
/sbin/iptables -t nat -N NAT_DESTINATION 2>/dev/null
# Create config files for firewall and fix permissions.
touch /var/ipfire/firewall/config
touch /var/ipfire/firewall/input
touch /var/ipfire/firewall/outgoing
touch /var/ipfire/firewall/p2protocols
touch /var/ipfire/firewall/settings
touch /var/ipfire/fwhosts/customhosts
touch /var/ipfire/fwhosts/customnetworks
touch /var/ipfire/fwhosts/customgroups
touch /var/ipfire/fwhosts/customservices
touch /var/ipfire/fwhosts/customservicegrp
# Fix ownership.
chown -R nobody:nobody /var/ipfire/firewall
chown -R nobody:nobody /var/ipfire/fwhosts
# Convert firewall configuration
/usr/sbin/convert-xtaccess
/usr/sbin/convert-outgoingfw