aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-04-12 22:38:34 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-04-12 22:38:34 +0000
commit53c1991114573d525a036c05397cbcc05ed85ddd (patch)
tree6b960c4bf72a3356c7eb8d03c11c6c6f263f3579 /package
parent84191e727e7ad19e0179c5533de5b289764bfa93 (diff)
downloadupstream-53c1991114573d525a036c05397cbcc05ed85ddd.tar.gz
upstream-53c1991114573d525a036c05397cbcc05ed85ddd.tar.bz2
upstream-53c1991114573d525a036c05397cbcc05ed85ddd.zip
[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
Diffstat (limited to 'package')
-rw-r--r--package/firewall/Makefile2
-rw-r--r--[-rwxr-xr-x]package/firewall/files/firewall.config8
-rw-r--r--package/firewall/files/firewall.user4
3 files changed, 9 insertions, 5 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 9d4e5dd31a..7aa385511f 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
index 46f7de5d77..464540f990 100755..100644
--- 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 0000000000..1ccbd01657
--- /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.
+