Update mjpg-streamer to 0.3.0

fredrikbaberg · Oct 17, 2021 · 68878db · 68878db
1 parent 16a12d4
commit 68878db
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 48 deletions.
diff --git a/mjpg-streamer/CHANGELOG.md b/mjpg-streamer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+[0.3.0]
+
+- Update tinyproxy version (1.11.0 at time of build)
+- Tweak proxy settings
+- Allow mjpg-streamer and both proxies to restart on error
+
 [0.2.0]
 
 - Add Gphoto2

diff --git a/mjpg-streamer/config.json b/mjpg-streamer/config.json
@@ -1,6 +1,6 @@
 {
     "name": "mjpg-streamer",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "slug": "mjpg-streamer",
     "description": "mjpg-streamer add-on for Home Assistant",
     "arch": ["armv7", "amd64", "armhf", "aarch64", "i386"],
@@ -11,7 +11,7 @@
         "8000/tcp": null
     },
     "ports_description": {
-        "8000/tcp": "Web-based interface)"
+        "8000/tcp": "Web-based interface"
     },
     "homeassistant": "2021.1.0",
     "video": true,

diff --git a/mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/finish b/mjpg-streamer/rootfs/etc/services.d/mjpg-streamer/finish
diff --git a/mjpg-streamer/rootfs/etc/services.d/tinyproxy-ingress/finish b/mjpg-streamer/rootfs/etc/services.d/tinyproxy-ingress/finish
diff --git a/mjpg-streamer/rootfs/etc/services.d/tinyproxy-ingress/tinyproxy.conf b/mjpg-streamer/rootfs/etc/services.d/tinyproxy-ingress/tinyproxy.conf
@@ -6,19 +6,19 @@ Group nogroup
 Port 8099
 
 BindSame yes
-Timeout 600
+# Timeout 10
 
-LogLevel Info
-PidFile "/var/run/tinyproxy/tinyproxy.pid"
+# LogLevel Info
+# PidFile "/var/run/tinyproxy/tinyproxy-ingress.pid"
 
-MaxClients 5
-MinSpareServers 2
-MaxSpareServers 5
-StartServers 2
+# MaxClients 5
+# MinSpareServers 2
+# MaxSpareServers 10
+# StartServers 2
 
-MaxRequestsPerChild 0
+# MaxRequestsPerChild 0
 
-ViaProxyName "tinyproxymjpgstreamer"
+# ViaProxyName "tinyproxymjpgstreamer-ingress"
 
 ReversePath "/" "http://127.0.0.1:80/"
 

diff --git a/mjpg-streamer/rootfs/etc/services.d/tinyproxy-web/finish b/mjpg-streamer/rootfs/etc/services.d/tinyproxy-web/finish
diff --git a/mjpg-streamer/rootfs/etc/services.d/tinyproxy-web/run b/mjpg-streamer/rootfs/etc/services.d/tinyproxy-web/run
@@ -2,4 +2,4 @@
 
 bashio::log.info "Starting tinyproxy for Ingress..."
 
-tinyproxy -d -c tinyproxy.conf
+tinyproxy -d -c tinyproxy.conf
diff --git a/mjpg-streamer/rootfs/etc/services.d/tinyproxy-web/tinyproxy.conf b/mjpg-streamer/rootfs/etc/services.d/tinyproxy-web/tinyproxy.conf
@@ -6,19 +6,19 @@ Group nogroup
 Port 8000
 
 BindSame yes
-Timeout 600
+# Timeout 10
 
-LogLevel Info
-PidFile "/var/run/tinyproxy/tinyproxy.pid"
+# LogLevel Info
+# PidFile "/var/run/tinyproxy/tinyproxy-web.pid"
 
-MaxClients 5
-MinSpareServers 2
-MaxSpareServers 5
-StartServers 2
+# MaxClients 5
+# MinSpareServers 2
+# MaxSpareServers 10
+# StartServers 2
 
-MaxRequestsPerChild 0
+# MaxRequestsPerChild 0
 
-ViaProxyName "tinyproxymjpgstreamer"
+# ViaProxyName "tinyproxymjpgstreamer-web"
 
 ReversePath "/" "http://127.0.0.1:80/"