From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 11 Oct 2015 14:06:10 +0000 (+0300)
Subject: added settings to configure the motion HTTP control interface
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=c3b6a1637a50fee4d21e9fde6c9c2620f276383e;p=motioneye-debian

added settings to configure the motion HTTP control interface
---

diff --git a/extra/motioneye.conf.sample b/extra/motioneye.conf.sample
index 79503c5..50cb251 100644
--- a/extra/motioneye.conf.sample
+++ b/extra/motioneye.conf.sample
@@ -29,6 +29,13 @@ listen 0.0.0.0
 # the TCP port to listen on
 port 8765
 
+# whether motion HTTP control interface listens on
+# localhost or on all interfaces
+motion_control_localhost true
+
+# the TCP port that motion HTTP control interface listens on
+motion_control_port 7999
+
 # interval in seconds at which motionEye checks the SMB mounts
 mount_check_interval 300
 
diff --git a/motioneye/__init__.py b/motioneye/__init__.py
index f1fe1b0..fda9095 100644
--- a/motioneye/__init__.py
+++ b/motioneye/__init__.py
@@ -1,2 +1,2 @@
 
-VERSION = "0.28"
+VERSION = "0.28-git"
diff --git a/motioneye/config.py b/motioneye/config.py
index a050da2..6960894 100644
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -1577,10 +1577,14 @@ def _set_default_motion(data, old_motion):
     data.setdefault('@normal_password', '')
 
     if old_motion:
-        data.setdefault('control_port', 7999)
+        data.setdefault('control_port', settings.MOTION_CONTROL_PORT)
+        data.setdefault('control_html_output', True)
+        data.setdefault('control_localhost', settings.MOTION_CONTROL_LISTEN_LOCALHOST)
     
     else:
-        data.setdefault('webcontrol_port', 7999)
+        data.setdefault('webcontrol_port', settings.MOTION_CONTROL_PORT)
+        data.setdefault('webcontrol_html_output', True)
+        data.setdefault('webcontrol_localhost', settings.MOTION_CONTROL_LISTEN_LOCALHOST)
 
 
 def _set_default_motion_camera(camera_id, data):
diff --git a/motioneye/settings.py b/motioneye/settings.py
index 965a2ab..1c02a4a 100644
--- a/motioneye/settings.py
+++ b/motioneye/settings.py
@@ -56,6 +56,13 @@ LISTEN = '0.0.0.0'
 # the TCP port to listen on
 PORT = 8765
 
+# whether motion HTTP control interface listens on
+# localhost or on all interfaces
+MOTION_CONTROL_LISTEN_LOCALHOST = True
+
+# the TCP port that motion HTTP control interface listens on
+MOTION_CONTROL_PORT = 7999
+
 # interval in seconds at which motionEye checks the SMB mounts
 MOUNT_CHECK_INTERVAL = 300
 
diff --git a/motioneye/templates/main.html b/motioneye/templates/main.html
index 18e7137..1abebdd 100644
--- a/motioneye/templates/main.html
+++ b/motioneye/templates/main.html
@@ -227,7 +227,7 @@
                     <tr class="settings-item advanced-setting" min="0" max="100" snap="2" ticksnum="5" decimals="0" unit="%">
                         <td class="settings-item-label"><span class="settings-item-label">Light Switch Detection</span></td>
                         <td class="settings-item-value"><input type="text" class="range styled device camera-config" id="lightSwitchDetectSlider"></td>
-                        <td><span class="help-mark" title="sets the percentage of the image that needs to change so that the event is treated as a sudden light change instead of motion">?</span></td>
+                        <td><span class="help-mark" title="sets the percentage of the image that needs to change so that the event is treated as a sudden light change instead of motion (0% disables the function)">?</span></td>
                     </tr>
                     <tr class="settings-item advanced-setting" min="0" max="100" snap="2" ticksnum="5" decimals="0" unit="%">
                         <td class="settings-item-label"><span class="settings-item-label">Brightness</span></td>