Switch to separate nginx conf file and update liquidsoap to master

mbugeia · Dec 12, 2019 · eff729d · eff729d
1 parent 97284ff
commit eff729d
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 59 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,10 +5,10 @@ services:
     build:
       context: liquidsoap
       args:
-        gitbranch: reporting-tools
+        gitbranch: master
         version: 1.5.0
-        buildnumber: 2448
-    image: privyplace/liquidsoap:reporting-tools-1.5.0-2448
+        buildnumber: 2462
+    image: privyplace/liquidsoap:master-1.5.0-2462
     container_name: liquidsoap
     command: /radio/live.liq
     restart: unless-stopped
@@ -39,6 +39,7 @@ services:
      - 8080:80/tcp
     volumes:
      - ./hls:/hls
+     - ./nginxhls/stream.conf:/etc/nginx/conf.d/stream.conf
   prometheus:
     image: prom/prometheus:v2.14.0
     container_name: prometheus

diff --git a/nginxhls/nginx.conf b/nginxhls/nginx.conf
@@ -61,61 +61,6 @@ log_format json_combined escape=json
   gzip_proxied any;
   gzip_types application/vnd.apple.mpegurl video/mp2t;
 
-
-  server {
-    listen 80;
-
-    server_name _;
-
-    location /healthz {
-      access_log off;
-      return 200;
-    }
-
-    location /api {
-      add_header Allow "GET" always;
-      if ( $request_method !~ ^(GET)$ ) {
-        return 405;
-      }
-      rewrite /api/(.*) /$1 break;
-      proxy_pass http://liquidsoap:8081;
-      proxy_redirect off;
-      proxy_set_header Host $host;
-    }
-
-    types {
-      application/vnd.apple.mpegurl m3u8;
-      video/mp2t ts;
-    }
-
-    location ~ \.(ts|m3u8)$ {
-      add_header Allow "GET, HEAD" always;
-      if ( $request_method !~ ^(GET|HEAD)$ ) {
-        return 405;
-      }
-
-      root /hls;
-
-      add_header 'Access-Control-Allow-Origin' '*';
-      add_header 'Access-Control-Allow-Methods' 'GET';
-      add_header 'Access-Control-Allow-Headers' '*';
-
-      location ~ \.(ts)$ {
-        add_header 'Cache-Control' 'public, max-age=31536000';
-      }
-
-      location ~ (lofi|midfi|hifi)\.(m3u8)$ {
-        add_header 'Cache-Control' 'max-age=1';
-      }
-
-      location ~ \.(m3u8)$ {
-        add_header 'Cache-Control' 'max-age=600';
-      }
-    }
-
-    location / {
-      return 404;
-    }
-  }
+  include conf.d/*.conf;
 
 }
diff --git a/nginxhls/stream.conf b/nginxhls/stream.conf
@@ -0,0 +1,55 @@
+  server {
+    listen 80;
+
+    server_name _;
+
+    location /healthz {
+      access_log off;
+      return 200;
+    }
+
+    location /api {
+      add_header Allow "GET" always;
+      if ( $request_method !~ ^(GET)$ ) {
+        return 405;
+      }
+      rewrite /api/(.*) /$1 break;
+      proxy_pass http://liquidsoap:8081;
+      proxy_redirect off;
+      proxy_set_header Host $host;
+    }
+
+    types {
+      application/vnd.apple.mpegurl m3u8;
+      video/mp2t ts;
+    }
+
+    location ~ \.(ts|m3u8)$ {
+      add_header Allow "GET, HEAD" always;
+      if ( $request_method !~ ^(GET|HEAD)$ ) {
+        return 405;
+      }
+
+      root /hls;
+
+      add_header 'Access-Control-Allow-Origin' '*';
+      add_header 'Access-Control-Allow-Methods' 'GET';
+      add_header 'Access-Control-Allow-Headers' '*';
+
+      location ~ \.(ts)$ {
+        add_header 'Cache-Control' 'public, max-age=31536000';
+      }
+
+      location ~ (lofi|midfi|hifi)\.(m3u8)$ {
+        add_header 'Cache-Control' 'max-age=1';
+      }
+
+      location ~ \.(m3u8)$ {
+        add_header 'Cache-Control' 'max-age=600';
+      }
+    }
+
+    location / {
+      return 404;
+    }
+  }