X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fconfigroot;h=f8fe4264293fbb9ff273c8df6b643dadb76b723f;hp=1c8f21f6d07a88a86d2f5621194c75b79914b537;hb=51379603c8161d5ef6ede182251789d098a3d833;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be

diff --git a/lfs/configroot b/lfs/configroot
index 1c8f21f6d..f8fe42642 100644
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -50,22 +50,23 @@ $(TARGET) :
 	@$(PREBUILD)
 
 	# Create all directories
-	for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes \
-	    ethernet extrahd/bin fwlogs isdn key langs logging main mbmon menu.d modem net-traffic \
-			net-traffic/templates nfs optionsfw outgoing/bin patches pakfire portfw \
-	    ppp private proxy/advanced/cre proxy/calamaris/bin qos/bin red remote snort time tripwire/report \
+	for i in addon-lang auth backup ca certs connscheduler crls ddns dhcp dhcpc dmzholes dns \
+			ethernet extrahd/bin fwlogs isdn key langs logging mac main  menu.d modem net-traffic \
+			net-traffic/templates nfs optionsfw outgoing/bin outgoing/groups outgoing/groups/ipgroups \
+			outgoing/groups/macgroups ovpn patches pakfire portfw ppp private proxy/advanced/cre \
+			proxy/calamaris/bin qos/bin red remote sensors snort time tripwire/report \
 			updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \
-	    wakeonlan wireless xtaccess ; do \
+			wakeonlan wireless xtaccess ; do \
 	        mkdir -p $(CONFIG_ROOT)/$$i; \
 	done
 
 	# Touch empty files
 	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 dmzholes/config ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
+	    dhcp/fixleases dhcp/advoptions dhcp/dhcpd.conf.local dmzholes/config dns/settings ethernet/aliases ethernet/settings ethernet/known_nics ethernet/scanned_nics \
 	    extrahd/scan extrahd/devices extrahd/partitions extrahd/settings fwlogs/ipsettings fwlogs/portsettings \
-	    isdn/settings main/hosts main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
-	    portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
+	    isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings outgoing/settings outgoing/rules \
+	    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 \
 	    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 \
@@ -82,7 +83,7 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/connscheduler-lib.pl	$(CONFIG_ROOT)/connscheduler/lib.pl
 	cp $(DIR_SRC)/config/cfgroot/connscheduler.conf		$(CONFIG_ROOT)/connscheduler
 	cp $(DIR_SRC)/config/extrahd/*				$(CONFIG_ROOT)/extrahd/bin/
-	cp $(DIR_SRC)/config/cfgroot/mbmon-settings		$(CONFIG_ROOT)/mbmon/settings
+	cp $(DIR_SRC)/config/cfgroot/sensors-settings		$(CONFIG_ROOT)/sensors/settings
 	cp $(DIR_SRC)/config/menu/*					$(CONFIG_ROOT)/menu.d/
 	cp $(DIR_SRC)/config/cfgroot/modem-defaults		$(CONFIG_ROOT)/modem/defaults
 	cp $(DIR_SRC)/config/cfgroot/modem-settings		$(CONFIG_ROOT)/modem/settings
@@ -99,6 +100,7 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/time-settings		$(CONFIG_ROOT)/time/settings
 	cp $(DIR_SRC)/config/cfgroot/logging-settings		$(CONFIG_ROOT)/logging/settings
 	cp $(DIR_SRC)/config/cfgroot/useragents			$(CONFIG_ROOT)/proxy/advanced
+	cp $(DIR_SRC)/config/cfgroot/ethernet-vlans		$(CONFIG_ROOT)/ethernet/vlans
 	cp $(DIR_SRC)/langs/list					$(CONFIG_ROOT)/langs/
 
 	# Oneliner configfiles
@@ -106,7 +108,12 @@ $(TARGET) :
 	echo  "VPN_DELAYED_START=0"	>>$(CONFIG_ROOT)/vpn/settings
 	echo  "01"			> $(CONFIG_ROOT)/certs/serial
 	echo  "nameserver    1.2.3.4"	> $(CONFIG_ROOT)/ppp/fake-resolv.conf
-	echo  "DISABLEPING=NO"		> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPNEWNOTSYN=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPINPUT=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPOUTPUT=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPINPUT=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPOUTPUT=on"		>> $(CONFIG_ROOT)/optionsfw/settings
+	echo  "DROPPORTSCAN=on"		>> $(CONFIG_ROOT)/optionsfw/settings
 
 	# Modify variables in header.pl
 	sed -i -e "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" \
@@ -123,8 +130,7 @@ $(TARGET) :
 	    $(CONFIG_ROOT)/lang.pl
 
 	# Language files
-	cp $(DIR_SRC)/langs/de/cgi-bin/de.pl $(CONFIG_ROOT)/langs/
-	cp $(DIR_SRC)/langs/en/cgi-bin/en.pl $(CONFIG_ROOT)/langs/
+	cp $(DIR_SRC)/langs/*/cgi-bin/*.pl $(CONFIG_ROOT)/langs/
 	
 	# Configroot permissions
 	chown -R nobody:nobody $(CONFIG_ROOT)
@@ -134,4 +140,7 @@ $(TARGET) :
 	done
 	chown root:nobody $(CONFIG_ROOT)/dhcpc
 
+	# Set outgoingfw.pl executable
+	chmod 755 $(CONFIG_ROOT)/outgoing/bin/outgoingfw.pl
+
 	@$(POSTBUILD)