diff --git a/bundles/nginx-rtmps/README.md b/bundles/nginx-rtmps/README.md index 3935da6..bcbf2e6 100644 --- a/bundles/nginx-rtmps/README.md +++ b/bundles/nginx-rtmps/README.md @@ -4,12 +4,12 @@ OBS publish ------- -obs stream to `rtmps://rtmp.sublimity.de:1937/24b626n246n2462v46bb2n2` stream key `ckn` +obs stream to `rtmps://rtmp.sublimity.de:1936/24b626n246n2462v46bb2n2` stream key `ckn` input ----- - Media Source - uncheck Local File -- Input: `rtmps://rtmp.sublimity.de:1937/24b626n246n2462v46bb2n2/ckn` +- Input: `rtmps://rtmp.sublimity.de:1936/24b626n246n2462v46bb2n2/ckn` diff --git a/bundles/nginx-rtmps/files/rtmps.conf b/bundles/nginx-rtmps/files/rtmps.conf index 4f30c69..4764dc8 100644 --- a/bundles/nginx-rtmps/files/rtmps.conf +++ b/bundles/nginx-rtmps/files/rtmps.conf @@ -1,11 +1,11 @@ stream { upstream rtmp { - server 127.0.0.1:1936; + server 127.0.0.1:1935; } server { - listen 1937 ssl; - listen [::]:1937 ssl; + listen 1936 ssl; + listen [::]:1936 ssl; ssl_certificate /var/lib/dehydrated/certs/${server_name}/fullchain.pem; ssl_certificate_key /var/lib/dehydrated/certs/${server_name}/privkey.pem; @@ -16,7 +16,7 @@ stream { rtmp { server { - listen 127.0.0.1:1936; + listen 127.0.0.1:1935; chunk_size 4096; application ${stream_key} { @@ -32,7 +32,7 @@ rtmp { deny publish all; # no need to publish on /live allow play all; # playing allowed - pull rtmp://127.0.0.1:1936/${stream_key}; + pull rtmp://127.0.0.1:1935/${stream_key}; } } } diff --git a/bundles/nginx-rtmps/items.py b/bundles/nginx-rtmps/items.py index ae6bb08..1c19a22 100644 --- a/bundles/nginx-rtmps/items.py +++ b/bundles/nginx-rtmps/items.py @@ -4,6 +4,9 @@ files = { 'context': { 'server_name': node.metadata.get('nginx-rtmps/hostname'), 'stream_key': node.metadata.get('nginx-rtmps/stream_key'), - } + }, + 'triggers': [ + 'svc_systemd:nginx:restart', + ], }, } diff --git a/bundles/nginx-rtmps/metadata.py b/bundles/nginx-rtmps/metadata.py index 604bcc6..ec722ef 100644 --- a/bundles/nginx-rtmps/metadata.py +++ b/bundles/nginx-rtmps/metadata.py @@ -7,7 +7,7 @@ defaults = { }, 'nftables': { 'input': { - 'tcp dport 1937 accept', + 'tcp dport 1936 accept', }, }, }