diff options
-rw-r--r-- | src/examples/elevate2018.yml | 2 | ||||
-rwxr-xr-x | src/flufigut.py | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml index fd7dd07..61f9e51 100644 --- a/src/examples/elevate2018.yml +++ b/src/examples/elevate2018.yml @@ -105,7 +105,7 @@ streams: nginx-port: 8000 max-bw: 290000000 burst-on-connect: 5 - hostname: "elevate-live%i.spreadspace.org" + hostname: "emc-%02i.spreadspace.org" repeater: True records: av: diff --git a/src/flufigut.py b/src/flufigut.py index bf043e2..9cc08ce 100755 --- a/src/flufigut.py +++ b/src/flufigut.py @@ -709,7 +709,18 @@ class K8sDeployment: if not needs_sfive: return - proxy_conf = {'listen': ':8080', 'protocol': 'http', 'connect': 'http://flumotion-worker-' + worker['name'] + ':8000'} + # TODO: hardcoded values + proxy_conf = {'listen': ':8000', 'protocol': 'http'} + proxy_conf['connect'] = 'http://flumotion-worker-' + worker['name'] + ':8000' + proxy_conf['request_header'] = [{'op': 'del', 'header': 'X-Forwarded-For'}] + proxy_conf['response_header'] = [{'op': 'set', 'header': 'Cache-Control', 'value': 'no-cache'}, + {'op': 'add', 'header': 'Cache-Control', 'value': 'no-store'}, + {'op': 'add', 'header': 'Cache-Control', 'value': 'must-revalidate'}, + {'op': 'add', 'header': 'Cache-Control', 'value': 'max-age=0'}, + {'op': 'time', 'header': 'Expires', 'value': '-1s'}] + proxy_conf['backends'] = {} + proxy_conf['backends']['/hls/'] = {'connect': 'http://nginx-streamer-' + worker['name'] + ':8000'} + proxy_conf['backends']['/dash/'] = {'connect': 'http://nginx-streamer-' + worker['name'] + ':8000'} cm = self.__generate_object(tmpl_env, 'sfive-proxy-cm.yml', worker) cm['data']['proxy.json'] = json.dumps(proxy_conf) v1.create_namespaced_config_map(self._namespace, cm) |