From bc30682b9e53bc33ba00e164870b7ca7fbc9fb9e Mon Sep 17 00:00:00 2001
From: Lukas Schulz <lukas.schulz@simiworld.de>
Date: Tue, 1 Dec 2020 21:21:15 +0100
Subject: [PATCH 1/5] changed cdn-url to https to fix mixed content stuff

---
 configuration/server/cdn/cdn-lb.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/server/cdn/cdn-lb.nix b/configuration/server/cdn/cdn-lb.nix
index f717ba6..d6f79da 100644
--- a/configuration/server/cdn/cdn-lb.nix
+++ b/configuration/server/cdn/cdn-lb.nix
@@ -8,7 +8,7 @@
     virtualHosts."${config.networking.hostName}.live.hacc.media" = {
       locations = {
         "/" = {
-          return = "301 \"http://$cdnhosts$request_uri\"";
+          return = "301 \"https://$cdnhosts$request_uri\"";
           extraConfig = ''
             auth_basic off;
           '';

From cdaad1a973c5040a64418b133889866673d6b0d5 Mon Sep 17 00:00:00 2001
From: Lukas Schulz <lukas.schulz@simiworld.de>
Date: Tue, 1 Dec 2020 21:25:29 +0100
Subject: [PATCH 2/5] added cors header

---
 configuration/server/cdn/cdn-master.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configuration/server/cdn/cdn-master.nix b/configuration/server/cdn/cdn-master.nix
index 14e866c..fa2e9b4 100644
--- a/configuration/server/cdn/cdn-master.nix
+++ b/configuration/server/cdn/cdn-master.nix
@@ -10,6 +10,7 @@ in {
     virtualHosts."${config.networking.hostName}.live.hacc.media" = {
       locations = {
         "~* \\.(m3u8)$" = {
+        add_header 'Access-Control-Allow-Origin' '*';
           proxyPass = "${host-server}$request_uri";
           extraConfig = ''
             #proxy_cache = off;
@@ -18,6 +19,7 @@ in {
           '';
         };
         "/hls" = {
+        add_header 'Access-Control-Allow-Origin' '*';
           proxyPass = "${host-server}$request_uri";
           extraConfig = ''
             types {

From 6b50ef9de5f042d1f4f26804440b68019257b0d6 Mon Sep 17 00:00:00 2001
From: Lukas Schulz <lukas.schulz@simiworld.de>
Date: Tue, 1 Dec 2020 21:28:24 +0100
Subject: [PATCH 3/5] repositioned cors header

---
 configuration/server/cdn/cdn-master.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configuration/server/cdn/cdn-master.nix b/configuration/server/cdn/cdn-master.nix
index fa2e9b4..28842a3 100644
--- a/configuration/server/cdn/cdn-master.nix
+++ b/configuration/server/cdn/cdn-master.nix
@@ -19,7 +19,7 @@ in {
           '';
         };
         "/hls" = {
-        add_header 'Access-Control-Allow-Origin' '*';
+
           proxyPass = "${host-server}$request_uri";
           extraConfig = ''
             types {
@@ -30,6 +30,7 @@ in {
             proxy_ignore_headers Cache-Control;
             proxy_cache_valid any 30m;
             auth_basic off;
+            add_header 'Access-Control-Allow-Origin' '*';
           '';
         };
       };

From fe01c721a6fa6d7b9e257d23e077703b3c6f5028 Mon Sep 17 00:00:00 2001
From: Lukas Schulz <lukas.schulz@simiworld.de>
Date: Tue, 1 Dec 2020 21:32:36 +0100
Subject: [PATCH 4/5] escaped '

---
 configuration/server/cdn/cdn-master.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration/server/cdn/cdn-master.nix b/configuration/server/cdn/cdn-master.nix
index 28842a3..7dff0be 100644
--- a/configuration/server/cdn/cdn-master.nix
+++ b/configuration/server/cdn/cdn-master.nix
@@ -30,7 +30,7 @@ in {
             proxy_ignore_headers Cache-Control;
             proxy_cache_valid any 30m;
             auth_basic off;
-            add_header 'Access-Control-Allow-Origin' '*';
+            add_header \'Access-Control-Allow-Origin\' \'*\';
           '';
         };
       };

From 77ed77aa9358096e4bbd7f8d7fda0ffcfcc67334 Mon Sep 17 00:00:00 2001
From: Lukas Schulz <lukas.schulz@simiworld.de>
Date: Tue, 1 Dec 2020 21:33:13 +0100
Subject: [PATCH 5/5] repositioned second CORS header

---
 configuration/server/cdn/cdn-master.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/configuration/server/cdn/cdn-master.nix b/configuration/server/cdn/cdn-master.nix
index 7dff0be..dde85bf 100644
--- a/configuration/server/cdn/cdn-master.nix
+++ b/configuration/server/cdn/cdn-master.nix
@@ -10,12 +10,13 @@ in {
     virtualHosts."${config.networking.hostName}.live.hacc.media" = {
       locations = {
         "~* \\.(m3u8)$" = {
-        add_header 'Access-Control-Allow-Origin' '*';
+
           proxyPass = "${host-server}$request_uri";
           extraConfig = ''
             #proxy_cache = off;
             expires 2s;
             auth_basic off;
+            add_header 'Access-Control-Allow-Origin' '*';
           '';
         };
         "/hls" = {
@@ -30,7 +31,7 @@ in {
             proxy_ignore_headers Cache-Control;
             proxy_cache_valid any 30m;
             auth_basic off;
-            add_header \'Access-Control-Allow-Origin\' \'*\';
+            add_header 'Access-Control-Allow-Origin' '*';
           '';
         };
       };