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

configroot: fix merge problem.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-09-01 20:52:06 +02:00
parent 4234cbe2ef
commit daa3a95004
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
config/rootfiles/common/configroot
View File

@@ -49,24 +49,25 @@ var/ipfire/extrahd/devices
var/ipfire/extrahd/partitions
var/ipfire/extrahd/scan
var/ipfire/extrahd/settings
var/ipfire/fwlogs
var/ipfire/forward
var/ipfire/forward/bin/rules.pl
#var/ipfire/forward
#var/ipfire/forward/bin
var/ipfire/forward/bin/firewall-lib.pl
var/ipfire/forward/settings
var/ipfire/forward/bin/rules.pl
var/ipfire/forward/config
var/ipfire/forward/input
var/ipfire/forward/outgoing
var/ipfire/forward/dmz
var/ipfire/forward/input
var/ipfire/forward/nat
var/ipfire/forward/outgoing
var/ipfire/forward/p2protocols
var/ipfire/fwhosts
var/ipfire/fwhosts/icmp-types
var/ipfire/forward/settings
#var/ipfire/fwhosts
var/ipfire/fwhosts/customgroups
var/ipfire/fwhosts/customhosts
var/ipfire/fwhosts/customnetworks
var/ipfire/fwhosts/customgroups
var/ipfire/fwhosts/customservices
var/ipfire/fwhosts/customservicegrp
var/ipfire/fwhosts/customservices
var/ipfire/fwhosts/icmp-types
var/ipfire/fwlogs
#var/ipfire/fwlogs/ipsettings
#var/ipfire/fwlogs/portsettings
var/ipfire/general-functions.pl
@@ -126,16 +127,6 @@ var/ipfire/net-traffic
#var/ipfire/nfs/nfs-server
var/ipfire/optionsfw
var/ipfire/optionsfw/settings
#var/ipfire/outgoing
#var/ipfire/outgoing/bin
#var/ipfire/outgoing/bin/outgoingfw.pl
#var/ipfire/outgoing/defaultservices
#var/ipfire/outgoing/groups
#var/ipfire/outgoing/groups/ipgroups
#var/ipfire/outgoing/groups/macgroups
#var/ipfire/outgoing/p2protocols
#var/ipfire/outgoing/rules
#var/ipfire/outgoing/settings
var/ipfire/ovpn
var/ipfire/ovpn/ccd.conf
var/ipfire/ovpn/ccdroute