[Astlinux-commits] SF.net SVN: astlinux:[7601] branches/1.0

[<abe...@us...>]

Revision: 7601
          http://sourceforge.net/p/astlinux/code/7601
Author:   abelbeck
Date:     2016-03-20 04:13:41 +0000 (Sun, 20 Mar 2016)
Log Message:
-----------
miniupnpd, use '/mnt/kd/upnp.leases' as a persistant lease_file so UPnP leases survive a reboot, also add UPNP_MIN_LIFETIME and UPNP_MAX_LIFETIME rc.conf variables.  Thanks to David Kerr

Modified Paths:
--------------
    branches/1.0/package/miniupnpd/miniupnpd.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/miniupnpd/miniupnpd.init
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.init	2016-03-19 18:40:08 UTC (rev 7600)
+++ branches/1.0/package/miniupnpd/miniupnpd.init	2016-03-20 04:13:41 UTC (rev 7601)
@@ -14,10 +14,15 @@
 UPNP_BITRATE_UP="${UPNP_BITRATE_UP:-1000000}"
 UPNP_BITRATE_DOWN="${UPNP_BITRATE_DOWN:-10000000}"
 
-MINIUPNPD=/usr/sbin/miniupnpd
-MINIUPNPD_CONF=/tmp/etc/miniupnpd.conf
-MINIUPNPD_LEASEFILE=/var/db/upnp.leases
+UPNP_MIN_LIFETIME="${UPNP_MIN_LIFETIME:-120}"
+UPNP_MAX_LIFETIME="${UPNP_MAX_LIFETIME:-86400}"
 
+MINIUPNPD="/usr/sbin/miniupnpd"
+MINIUPNPD_CONF="/tmp/etc/miniupnpd.conf"
+
+# Define persistant lease_file
+MINIUPNPD_LEASEFILE="/mnt/kd/upnp.leases"
+
 aif_miniupnpd_plugin()
 {
   local action="$1"
@@ -158,6 +163,10 @@
     return
   fi
 
+  # Symlink to persistant lease_file
+  # Note: The lease_file= can get deleted, so don't use symlink for it.
+  ln -sf "$MINIUPNPD_LEASEFILE" /var/db/upnp.leases
+
   astlinux_release="$(cat /etc/astlinux-release)"
 
   echo "http_port=5000
@@ -167,6 +176,8 @@
 bitrate_up=$UPNP_BITRATE_UP
 bitrate_down=$UPNP_BITRATE_DOWN
 secure_mode=$UPNP_SECURE_MODE
+min_lifetime=$UPNP_MIN_LIFETIME
+max_lifetime=$UPNP_MAX_LIFETIME
 system_uptime=yes
 notify_interval=60
 clean_ruleset_interval=600

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2016-03-19 18:40:08 UTC (rev 7600)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2016-03-20 04:13:41 UTC (rev 7601)
@@ -512,6 +512,8 @@
 #UPNP_BITRATE_UP=1000000
 #UPNP_BITRATE_DOWN=10000000
 #UPNP_SECURE_MODE="no"
+#UPNP_MIN_LIFETIME=120
+#UPNP_MAX_LIFETIME=86400
 
 ## XMPP (Jabber) Server - Prosody
 ## Data stored in /mnt/kd/prosody/ symlinked from /etc/prosody/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.