Splitting MediaRTX from Apache in docker-bundle

docker-bundle/docker/app/Dockerfile

@@ -33,7 +33,7 @@ RUN apt-get update \
         zip \
     && pecl install redis \
     && docker-php-ext-enable redis \
-    && a2enmod headers proxy proxy_http rewrite setenvif \
+    && a2enmod headers rewrite setenvif \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

docker-bundle/docker/app/apache/nyone.conf.template

@@ -22,22 +22,3 @@ ServerName ${APP_DOMAIN}
     ErrorLog /proc/self/fd/2
     CustomLog /proc/self/fd/1 combined
 </VirtualHost>
-
-<VirtualHost *:80>
-    ServerName ${HLS_DOMAIN}
-
-    ProxyRequests Off
-    ProxyPreserveHost On
-
-    ProxyPass "/" "http://mediamtx:${HLS_INTERNAL_PORT}/" retry=0
-    ProxyPassReverse "/" "http://mediamtx:${HLS_INTERNAL_PORT}/"
-
-    Header always set Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate"
-    Header always set Access-Control-Allow-Origin "${APP_URL}"
-    Header always set Access-Control-Allow-Methods "GET, HEAD, OPTIONS"
-    Header always set Access-Control-Allow-Headers "Range, Origin, Accept, Content-Type"
-
-    ErrorLog /proc/self/fd/2
-    CustomLog /proc/self/fd/1 combined
-</VirtualHost>
-

docker-bundle/docker/app/entrypoint.sh

@@ -41,9 +41,9 @@ artisan() {
 }
 
 render_apache_config() {
-    export APP_DOMAIN HLS_DOMAIN HLS_INTERNAL_PORT APP_URL
+    export APP_DOMAIN
 
-    envsubst '${APP_DOMAIN} ${HLS_DOMAIN} ${HLS_INTERNAL_PORT} ${APP_URL}' \
+    envsubst '${APP_DOMAIN}' \
         < /etc/apache2/sites-available/nyone.conf.template \
         > /etc/apache2/sites-available/000-default.conf
 }

docker-bundle/docker/mediamtx/entrypoint.sh

@@ -10,16 +10,14 @@ if [ -z "${MEDIAMTX_SHARED_SECRET:-}" ] || [ "${MEDIAMTX_SHARED_SECRET#change-me
     fail "MEDIAMTX_SHARED_SECRET is required. Run docker-bundle/scripts/deploy.sh or set it in docker-bundle/.env."
 fi
 
-: "${APP_URL:?APP_URL is required.}"
-: "${HLS_PUBLIC_URL:?HLS_PUBLIC_URL is required.}"
 : "${RTMP_INTERNAL_PORT:=1935}"
 : "${HLS_INTERNAL_PORT:=8888}"
 
 mkdir -p /config /var/www/html/storage/app/private/recordings
 
-export APP_URL HLS_PUBLIC_URL MEDIAMTX_SHARED_SECRET RTMP_INTERNAL_PORT HLS_INTERNAL_PORT
+export MEDIAMTX_SHARED_SECRET RTMP_INTERNAL_PORT HLS_INTERNAL_PORT
 
-envsubst '${APP_URL} ${HLS_PUBLIC_URL} ${MEDIAMTX_SHARED_SECRET} ${RTMP_INTERNAL_PORT} ${HLS_INTERNAL_PORT}' \
+envsubst '${MEDIAMTX_SHARED_SECRET} ${RTMP_INTERNAL_PORT} ${HLS_INTERNAL_PORT}' \
     < /etc/mediamtx/mediamtx.yml.template \
     > /config/mediamtx.yml
 

docker-bundle/docker/mediamtx/mediamtx.yml.template

@@ -16,9 +16,7 @@ rtmpAddress: :${RTMP_INTERNAL_PORT}
 hls: yes
 hlsAddress: :${HLS_INTERNAL_PORT}
 hlsVariant: mpegts
-hlsAllowOrigins:
-  - ${APP_URL}
-  - ${HLS_PUBLIC_URL}
+hlsAllowOrigins: []
 
 pathDefaults:
   record: yes
@@ -32,4 +30,3 @@ pathDefaults:
 paths:
   all_others:
     source: publisher
-