X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fconfigroot;h=58eb9d75325ca9fa9dee4304cff2c267dced0cd2;hp=d0cbd08ad7bb3949228ae304ee67c64a0ba00e04;hb=533a2da388be0f83732a07b5a40ec2792fd2fad5;hpb=bc3297257288edb70f77c74009669ddb901492ff

diff --git a/lfs/configroot b/lfs/configroot
index d0cbd08ad..58eb9d753 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -65,7 +65,7 @@ $(TARGET) :
 	for i in auth/users backup/include.user backup/exclude.user \
 	    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 \
-	    extrahd/scan extrahd/devices extrahd/partitions extrahd/settings forward/settings forward/config forward/input \
+	    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 \
 	    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 \
@@ -101,8 +101,13 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/ethernet-vlans		$(CONFIG_ROOT)/ethernet/vlans
 	cp $(DIR_SRC)/langs/list						$(CONFIG_ROOT)/langs/
 	cp $(DIR_SRC)/config/forwardfw/rules.pl			$(CONFIG_ROOT)/forward/bin/rules.pl
+	cp $(DIR_SRC)/config/forwardfw/convert-xtaccess	/usr/sbin/convert-xtaccess
+	cp $(DIR_SRC)/config/forwardfw/convert-outgoingfw	/usr/sbin/convert-outgoingfw
+	cp $(DIR_SRC)/config/forwardfw/convert-dmz	/usr/sbin/convert-dmz
+	cp $(DIR_SRC)/config/forwardfw/convert-portfw	/usr/sbin/convert-portfw
+	cp $(DIR_SRC)/config/forwardfw/p2protocols		$(CONFIG_ROOT)/forward/p2protocols
 	cp $(DIR_SRC)/config/forwardfw/firewall-lib.pl	$(CONFIG_ROOT)/forward/bin/firewall-lib.pl
-	cp $(DIR_SRC)/config/forwardfw/firewall-forward-policy	/usr/sbin/firewall-forward-policy
+	cp $(DIR_SRC)/config/forwardfw/firewall-policy	/usr/sbin/firewall-policy
 	cp $(DIR_SRC)/config/fwhosts/icmp-types			$(CONFIG_ROOT)/fwhosts/icmp-types
 	cp $(DIR_SRC)/config/fwhosts/customservices		$(CONFIG_ROOT)/fwhosts/customservices
 	# Oneliner configfiles
@@ -114,11 +119,23 @@ $(TARGET) :
 	echo  "DROPINPUT=on"		>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "DROPFORWARD=on"		>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "FWPOLICY=DROP"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "FWPOLICY1=DROP"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "FWPOLICY2=DROP"		>> $(CONFIG_ROOT)/optionsfw/settings
 	echo  "DROPPORTSCAN=on"		>> $(CONFIG_ROOT)/optionsfw/settings
-	echo  "POLICY=MODE0"		>> $(CONFIG_ROOT)/forward/settings
+	echo  "DROPOUTGOING=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "SHOWREMARK=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "SHOWCOLORS=off"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "SHOWTABLES=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "SHOWDROPDOWN=off"	>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "POLICY=MODE2"		>> $(CONFIG_ROOT)/forward/settings
+	echo  "POLICY1=MODE2"		>> $(CONFIG_ROOT)/forward/settings
 	
 	# set rules.pl executable
 	chmod 755 $(CONFIG_ROOT)/forward/bin/rules.pl
+		
+	# set converters executable
+	chmod 755 /usr/sbin/convert-*
+	
 	# Modify variables in header.pl
 	sed -i -e "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" \
 	    -e "s+VERSION+$(VERSION)+g" \