add a custom configuration file (from: #1180), remove trivial comments from init...

SVN-Revision: 6091

diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 4be8fbe01d0f0224fa3f9b219e0a5eebd011b3b3..547fec8f56cd0559b431f6bf01d102552d4e15a3 100644 (file)
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -57,11 +57,11 @@ endef
 define Package/linuxigd/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnpd $(1)/usr/sbin/
-       $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/upnpd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/linuxigd
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/*.gif $(1)/etc/linuxigd/
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/etc/*.xml $(1)/etc/linuxigd/
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) ./files/upnpd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/upnpd.init $(1)/etc/init.d/upnpd
 endef

diff --git a/net/linuxigd/files/upnpd.conf b/net/linuxigd/files/upnpd.conf
new file mode 100644 (file)
index 0000000..34a1612
--- /dev/null
+++ b/net/linuxigd/files/upnpd.conf
@@ -0,0 +1,71 @@
+#
+# The full path and name of the iptables executable,
+# (enclosed in quotes).
+#
+iptables_location = "/usr/sbin/iptables"
+
+#
+# Daemon debug level. Messages are logged via syslog to debug.
+# 0 - no debug messages
+# 1 - log errors
+# 2 - log errors and basic info
+# 3 - log errors and verbose info
+# default = 0
+debug_mode = 2
+
+#
+# Should the daemon insert rules in the forward chain
+# This is necessary if your firewall has a drop or reject
+# policy in your forward chain.
+# allowed values: yes,no
+# default = no
+insert_forward_rules = yes
+
+#
+# The name of the chain to put the forward rules in.
+# This directive is only activ if "insert_forward_rules = yes"
+# above.
+# allowed values: a-z, A-Z, _, -
+# default = FORWARD
+forward_chain_name = forwarding_wan
+
+#
+# The name of the chain to put prerouting rules in.
+# allowed values: a-z, A-Z, _, -
+# default = PREROUTING
+prerouting_chain_name = PREROUTING 
+
+#
+# The internet line upstream bit rate reported from
+# the daemon. Value in bits per second
+# default = 0
+upstream_bitrate = 512000
+
+#
+# The internet line downstream bit rate reported from
+# the daemon. Value in bits per second
+# default = 0
+downstream_bitrate = 512000
+
+#
+# The default duration of port mappings, used when the client
+# doesn't specify a duration.
+# Can have the following values:
+# 0 - no default duration specified
+# seconds | HH:MM - duration from the time of addition
+# @seconds | @HH:MM - expire mapping at the specified time of day
+# default = 0
+duration = 0
+
+# The name of the igd device xml description document
+# default = gatedesc.xml
+description_document_name = gatedesc.xml
+
+# The path to the xml documents
+# Do not include the trailing "/"
+# default = /etc/linuxigd
+# WARNING! The make install does put the xml files
+# in /etc/linuxigd, if you change this variable
+# you have to make sure the xml docs are in the
+# right place
+xml_document_path = /etc/linuxigd

diff --git a/net/linuxigd/files/upnpd.init b/net/linuxigd/files/upnpd.init
index f0618e906dc9030568ed241fa08e69432e2caa25..e250305f8242d9cabc10907ef7f09fd3b5e410fa 100644 (file)
--- a/net/linuxigd/files/upnpd.init
+++ b/net/linuxigd/files/upnpd.init
@@ -5,11 +5,7 @@ START=65
 
 include /lib/network
 scan_interfaces
-
-# $WAN contains WAN ifname     
 config_get WAN wan ifname
-
-# $LAN contains WAN ifname
 config_get LAN lan ifname
 
 start() {