NGINX: Support set the m3u8 and ts expire. v5.14.3

ossrs · Mar 1, 2024 · fc1055b · fc1055b
1 parent 59e12fa
commit fc1055b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/nginx-hls-cdn.yml b/.github/workflows/nginx-hls-cdn.yml
@@ -11,7 +11,7 @@ jobs:
         run: |
           SRS_MAJOR_HTTP=nginx-hls-cdn-http
           SRS_MAJOR_HTTPS=nginx-hls-cdn-https
-          SRS_VERSION=v1.0.1
+          SRS_VERSION=v1.0.2
           echo "SRS_MAJOR_HTTP=$SRS_MAJOR_HTTP" >> $GITHUB_ENV
           echo "SRS_MAJOR_HTTPS=$SRS_MAJOR_HTTPS" >> $GITHUB_ENV
           echo "SRS_VERSION=$SRS_VERSION" >> $GITHUB_ENV

diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -1140,6 +1140,7 @@ The following are the update records for the SRS Stack server.
     * Dubbing: Support VoD dubbing for multiple languages. v5.14.2
     * Dubbing: Support disable translation, rephrase, or tts. v5.14.3
     * Dubbing: Highlight the currently playing group. v5.14.3
+    * NGINX: Support set the m3u8 and ts expire. v5.14.3
 * v5.13:
     * Fix bug for vlive and transcript. v5.13.1
     * Support AWS Lightsail install script. v5.13.2

diff --git a/scripts/nginx-hls-cdn/Dockerfile.http b/scripts/nginx-hls-cdn/Dockerfile.http
@@ -3,7 +3,8 @@ ARG ARCH
 FROM ${ARCH}nginx:latest AS dist
 
 # The environment variables for template.
-ENV SRS_STACK_SERVER=127.0.0.1:2022
+ENV SRS_STACK_SERVER=127.0.0.1:2022 \
+    SRS_M3U8_EXPIRE=10 SRS_TS_EXPIRE=3600
 ADD nginx.edge.http.conf.template /etc/nginx/templates/default.conf.template
 
 # Create the proxy cache directory for NGINX.

diff --git a/scripts/nginx-hls-cdn/Dockerfile.https b/scripts/nginx-hls-cdn/Dockerfile.https
@@ -5,7 +5,8 @@ FROM ${ARCH}nginx:latest AS dist
 # The environment variables for template.
 ENV SRS_STACK_SERVER=127.0.0.1:2022 \
     SRS_STACK_SSL_KEY=/data/config/nginx.key \
-    SRS_STACK_SSL_CRT=/data/config/nginx.crt
+    SRS_STACK_SSL_CRT=/data/config/nginx.crt \
+    SRS_M3U8_EXPIRE=10 SRS_TS_EXPIRE=3600
 ADD nginx.edge.https.conf.template /etc/nginx/templates/default.conf.template
 
 # Create the proxy cache directory for NGINX.

diff --git a/scripts/nginx-hls-cdn/nginx.edge.http.conf.template b/scripts/nginx-hls-cdn/nginx.edge.http.conf.template
@@ -6,7 +6,7 @@ server {
     listen 80 default_server;
     listen [::]:80 default_server;
 
-    proxy_cache_valid  404      10s;
+    proxy_cache_valid  404 10s;
     proxy_cache_lock on;
     proxy_cache_lock_age 300s;
     proxy_cache_lock_timeout 300s;
@@ -18,7 +18,7 @@ server {
 
         proxy_cache srs_cache;
         proxy_cache_key $scheme$proxy_host$uri$args;
-        proxy_cache_valid  200 302  10s;
+        proxy_cache_valid  200 302 ${SRS_M3U8_EXPIRE}s;
         add_header X-Cache-Status $upstream_cache_status;
     }
 
@@ -28,7 +28,7 @@ server {
 
         proxy_cache srs_cache;
         proxy_cache_key $scheme$proxy_host$uri;
-        proxy_cache_valid  200 302  60m;
+        proxy_cache_valid  200 302 ${SRS_TS_EXPIRE}s;
         add_header X-Cache-Status $upstream_cache_status;
     }
 }
diff --git a/scripts/nginx-hls-cdn/nginx.edge.https.conf.template b/scripts/nginx-hls-cdn/nginx.edge.https.conf.template
@@ -15,7 +15,7 @@ server {
     ssl_session_cache shared:SSL:10m;
     ssl_session_timeout 10m;
 
-    proxy_cache_valid  404      10s;
+    proxy_cache_valid  404 10s;
     proxy_cache_lock on;
     proxy_cache_lock_age 300s;
     proxy_cache_lock_timeout 300s;
@@ -27,7 +27,7 @@ server {
 
         proxy_cache srs_cache;
         proxy_cache_key $scheme$proxy_host$uri$args;
-        proxy_cache_valid  200 302  10s;
+        proxy_cache_valid  200 302 ${SRS_M3U8_EXPIRE}s;
         add_header X-Cache-Status $upstream_cache_status;
     }
 
@@ -37,7 +37,7 @@ server {
 
         proxy_cache srs_cache;
         proxy_cache_key $scheme$proxy_host$uri;
-        proxy_cache_valid  200 302  60m;
+        proxy_cache_valid  200 302 ${SRS_TS_EXPIRE}s;
         add_header X-Cache-Status $upstream_cache_status;
     }
 }