Merge remote-tracking branch 'origin/master' into kiauh-rework

2025-12-21 23:03:35 +05:00 · 2021-01-25 19:01:55 +01:00
parent 65062bdfda d12554d2b7
commit 1527d7a25d
9 changed files with 11 additions and 17 deletions
--- a/resources/fluidd_nginx.cfg
+++ b/resources/fluidd_nginx.cfg
@@ -56,4 +56,4 @@ server {
    location /webcam/ {
        proxy_pass http://mjpgstreamer/;
    }
-}
+}
--- a/resources/mainsail_nginx.cfg
+++ b/resources/mainsail_nginx.cfg
@@ -56,4 +56,4 @@ server {
    location /webcam/ {
        proxy_pass http://mjpgstreamer/;
    }
-}
+}
--- a/resources/upstreams.conf
+++ b/resources/upstreams.conf
@@ -10,4 +10,4 @@ upstream mjpgstreamer {
    #edit your webcam port here
    ip_hash;
    server 127.0.0.1:8080;
-}
+}