From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 12 Apr 2009 22:38:34 +0000 (+0000)
Subject: [package] firewall: enable /etc/firewall.user by default and install sample firewall... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/4ed715651306ba1d3b73d9fa2197a55a3443c1d2

[package] firewall: enable /etc/firewall.user by default and install sample firewall.user file


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15221 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 9d4e5dd31..7aa385511 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config
old mode 100755
new mode 100644
index 46f7de5d7..464540f99
--- a/package/firewall/files/firewall.config
+++ b/package/firewall/files/firewall.config
@@ -22,6 +22,10 @@ config forwarding
 	option dest     wan
 	option mtu_fix	1
 
+# include a file with users custom iptables rules
+config include
+	option path /etc/firewall.user
+
 
 ### EXAMPLE CONFIG SECTIONS
 # do not allow a specific ip to access wan
@@ -53,10 +57,6 @@ config forwarding
 #	option dest_port	80 
 #	option proto		tcp
 
-# include a file with users custom iptables rules
-#config include
-#	option path /etc/firewall.user
-
 
 ### FULL CONFIG SECTIONS
 #config rule
diff --git a/package/firewall/files/firewall.user b/package/firewall/files/firewall.user
new file mode 100644
index 000000000..1ccbd0165
--- /dev/null
+++ b/package/firewall/files/firewall.user
@@ -0,0 +1,4 @@
+# This file is interpreted as shell script.
+# Put your custom iptables rules here, they will
+# be executed with each firewall (re-)start.
+