webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43: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/partitions
var/ipfire/extrahd/scan var/ipfire/extrahd/scan
var/ipfire/extrahd/settings var/ipfire/extrahd/settings
var/ipfire/fwlogs #var/ipfire/forward
var/ipfire/forward #var/ipfire/forward/bin
var/ipfire/forward/bin/rules.pl
var/ipfire/forward/bin/firewall-lib.pl var/ipfire/forward/bin/firewall-lib.pl
var/ipfire/forward/settings var/ipfire/forward/bin/rules.pl
var/ipfire/forward/config var/ipfire/forward/config
var/ipfire/forward/input
var/ipfire/forward/outgoing
var/ipfire/forward/dmz var/ipfire/forward/dmz
var/ipfire/forward/input
var/ipfire/forward/nat var/ipfire/forward/nat
var/ipfire/forward/outgoing
var/ipfire/forward/p2protocols var/ipfire/forward/p2protocols
var/ipfire/fwhosts var/ipfire/forward/settings
var/ipfire/fwhosts/icmp-types #var/ipfire/fwhosts
var/ipfire/fwhosts/customgroups
var/ipfire/fwhosts/customhosts var/ipfire/fwhosts/customhosts
var/ipfire/fwhosts/customnetworks var/ipfire/fwhosts/customnetworks
var/ipfire/fwhosts/customgroups
var/ipfire/fwhosts/customservices
var/ipfire/fwhosts/customservicegrp var/ipfire/fwhosts/customservicegrp
var/ipfire/fwhosts/customservices
var/ipfire/fwhosts/icmp-types
var/ipfire/fwlogs
#var/ipfire/fwlogs/ipsettings #var/ipfire/fwlogs/ipsettings
#var/ipfire/fwlogs/portsettings #var/ipfire/fwlogs/portsettings
var/ipfire/general-functions.pl var/ipfire/general-functions.pl
@@ -126,16 +127,6 @@ var/ipfire/net-traffic
#var/ipfire/nfs/nfs-server #var/ipfire/nfs/nfs-server
var/ipfire/optionsfw var/ipfire/optionsfw
var/ipfire/optionsfw/settings 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
var/ipfire/ovpn/ccd.conf var/ipfire/ovpn/ccd.conf
var/ipfire/ovpn/ccdroute var/ipfire/ovpn/ccdroute

9
lfs/configroot
View File

@@ -51,9 +51,8 @@ $(TARGET) :
# Create all directories # Create all directories
for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \ for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dns dnsforward \
ethernet extrahd/bin fwlogs isdn key langs logging mac main menu.d modem net-traffic \ ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main \
ethernet extrahd/bin fwlogs fwhosts forward forward/bin isdn key langs logging mac main menu.d modem net-traffic \ menu.d modem net-traffic net-traffic/templates nfs optionsfw \
net-traffic/templates nfs optionsfw \
ovpn patches pakfire portfw ppp private proxy/advanced/cre \ ovpn patches pakfire portfw ppp private proxy/advanced/cre \
proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \ proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
@@ -65,11 +64,11 @@ $(TARGET) :
for i in auth/users backup/include.user backup/exclude.user \ for i in auth/users backup/include.user backup/exclude.user \
certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \ certs/index.txt ddns/config ddns/noipsettings ddns/settings ddns/ipcache dhcp/settings \
dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \ dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dns/settings dnsforward/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \ ethernet/wireless extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input forward/outgoing forward/dmz forward/nat \
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
touch $(CONFIG_ROOT)/$$i; \ touch $(CONFIG_ROOT)/$$i; \