Merge pull request #208 from json-scada/master

Version 0.50-alpha

Author: riclolsen

README.md

@@ -48,7 +48,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 - MongoDB as the real-time core database, persistence layer, config store, SOE historian.
 - Event-based realtime async data processing with MongoDB Change Streams.
 - Portability and modular interoperability over Linux, Windows, Mac OSX, x86/64, ARM.
-- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha).
+- Windows installer available in the [releases section](https://github.com/riclolsen/json-scada/releases/tag/V0.50-alpha).
 - Unlimited tags, servers, and users.
 - Horizontal scalability, from a single computer to big clusters (MongoDB-sharding), Docker containers, VMs, Kubernetes, cloud, or hybrid deployments.
 - Modular distributed architecture. Lightweight redundant data acquisition nodes can connect securely over TLS to the database server. E.g. a Raspberry PI can be a data acquisition node.
@@ -90,7 +90,7 @@ To provide an easy to use, fully-featured, scalable, and portable SCADA/IIoT-I4.
 ## Documentation
 
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)
-- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.49-alpha)
+- [Windows Installer](https://github.com/riclolsen/json-scada/releases/tag/V0.50-alpha)
 - [RedHat/Rocky Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#rhel94-and-compatible-systems-automated-installation)
 - [Ubuntu Linux Installer Script](https://github.com/riclolsen/json-scada/blob/master/docs/install.md#ubuntu-2404-scripted-installation)
 - [Generic Install Guide](https://github.com/riclolsen/json-scada/blob/master/docs/install.md)

conf-templates/kor1-PergolaGrid.svg

@@ -5,7 +5,7 @@ worker_processes  1;
 #error_log  ../log/error.log;
 #error_log  ../log/error.log  notice;
 #error_log  ../log/error.log  info;
-error_log  "c:/json-scada/log/error.log"  crit;
+error_log  "c:/json-scada/log/nginx-error.log"  crit;
 
 #pid        ../log/nginx.pid;
 

conf-templates/nginx.conf

@@ -85,6 +85,18 @@
             fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
         }
 
+        # pass /camNNN to the corresponding JSMpeg server listening on port 9001, 9002, etc.
+        #
+        location ~ ^/cam(?<cam_id>\d\{3\})$ {
+            set $port 9000;
+            set $port $port$cam_id;
+            proxy_pass         http://127.0.0.1:$port;
+            proxy_set_header   Host $host;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+        
         # deny access to .htaccess files
         location ~ /\.ht {
            deny all;