From 3e87f673bd262f7808c1fac7b0f853cab71a098d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 18 Feb 2018 17:44:07 +0100 Subject: revamp handling of sfive proxy --- templates/default/kubernetes/nginx-streamer-cm.yml.j2 | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'templates/default/kubernetes/nginx-streamer-cm.yml.j2') diff --git a/templates/default/kubernetes/nginx-streamer-cm.yml.j2 b/templates/default/kubernetes/nginx-streamer-cm.yml.j2 index b7a9901..563245c 100644 --- a/templates/default/kubernetes/nginx-streamer-cm.yml.j2 +++ b/templates/default/kubernetes/nginx-streamer-cm.yml.j2 @@ -1,6 +1,3 @@ -%% set flumotion_port = desc.streams[worker.flags.stream].port -%% set nginx_port = desc.streams[worker.flags.stream]['nginx-port'] -%% set hostname = worker.flags['stream-hostname'] apiVersion: v1 kind: ConfigMap metadata: @@ -38,8 +35,8 @@ data: access_log /dev/null; server { - listen {{ nginx_port }} default_server; - listen [::]:{{ nginx_port }} default_server; + listen {{ desc.streams[worker.flags.stream].port }} default_server; + listen [::]:{{ desc.streams[worker.flags.stream].port }} default_server; server_name _; root /srv/www; @@ -72,7 +69,7 @@ data: hls_fragment_naming timestamp; hls_fragment_slicing aligned; hls_type live; - hls_base_url http://{{ hostname }}:{{ nginx_port }}/hls/; + hls_base_url http://{{ worker.flags['stream-hostname'] }}:{{ desc.streams[worker.flags.stream].port }}/hls/; %% for mux in desc.streams[worker.flags.stream]['nginx-muxes'] %% for profile in desc.muxes[mux].formats.flash @@ -97,7 +94,7 @@ data: respawn on; %% for mux in desc.streams[worker.flags.stream]['nginx-muxes'] %% for profile in desc.muxes[mux].formats.flash - exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:{{ flumotion_port }}/{{ mux }}-flash-{{ profile }}.flv + exec_static ffmpeg -i http://flumotion-worker-{{ worker.name }}:{{ desc.streams[worker.flags.stream].port }}/{{ mux }}-flash-{{ profile }}.flv -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/hls/{{ mux }}-{{ profile }} -acodec copy -vcodec copy -vbsf h264_mp4toannexb -f flv rtmp://localhost/dash/{{ mux }}-{{ profile }}; %% endfor -- cgit v1.2.3