rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes #5501 -- Add "/radio/8xx5" as supported WebDJ alias

This commit is contained in:
Buster "Silver Eagle" Neece 2022-06-23 11:23:03 -05:00
parent 8b128b3011
commit 058d62706b
No known key found for this signature in database
GPG Key ID: F1D2E64A0005E80E
5 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Nginx/ConfigWriter.php
View File

@ -35,13 +35,11 @@ final class ConfigWriter implements EventSubscriberInterface
}
$listenBaseUrl = CustomUrls::getListenUrl($station);
$port = $station->getFrontendConfig()->getPort();
$event->appendBlock(
<<<NGINX
# Reverse proxy the frontend broadcast.
location ~ ^{$listenBaseUrl}(/?)(.*)\$ {
location ~ ^({$listenBaseUrl}|/radio/{$port})(/?)(.*)\$ {
include proxy_params;
proxy_intercept_errors on;
@ -50,7 +48,7 @@ final class ConfigWriter implements EventSubscriberInterface
proxy_connect_timeout 60;
proxy_set_header Host localhost:{$port};
proxy_pass http://127.0.0.1:{$port}/\$2?\$args;
proxy_pass http://127.0.0.1:{$port}/\$3?\$args;
}
NGINX
);
@ -72,10 +70,10 @@ final class ConfigWriter implements EventSubscriberInterface
$event->appendBlock(
<<<NGINX
# Reverse proxy the WebDJ connection.
location ~ ^{$webDjBaseUrl}(/?)(.*)\$ {
location ~ ^({$webDjBaseUrl}|/radio/{$autoDjPort})(/?)(.*)\$ {
include proxy_params;
proxy_pass http://127.0.0.1:{$autoDjPort}/$2;
proxy_pass http://127.0.0.1:{$autoDjPort}/$3;
}
NGINX
);

2
update.sh
View File

@ -34,7 +34,7 @@ else
fi
APP_ENV="${APP_ENV:-production}"
UPDATE_REVISION="${UPDATE_REVISION:-88}"
UPDATE_REVISION="${UPDATE_REVISION:-89}"
echo "Updating AzuraCast (Environment: $APP_ENV, Update revision: $UPDATE_REVISION)"

20
util/ansible/roles/nginx/templates/default.j2
View File

@ -131,25 +131,6 @@ server {
internal;
}
# Reverse proxy all possible radio listening ports (8000, 8010...8480, 8490)
location ~ ^/radio/(8[0-4][0-9]0)(/?)(.*)$ {
proxy_buffering off;
proxy_ignore_client_abort off;
proxy_intercept_errors on;
proxy_next_upstream error timeout invalid_header;
proxy_redirect off;
proxy_connect_timeout 60;
proxy_send_timeout 21600;
proxy_read_timeout 21600;
proxy_set_header Host localhost:$1;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $remote_addr;
proxy_pass http://127.0.0.1:$1/$3?$args;
}
# pub/sub endpoints
location ~ /api/live/nowplaying/([^\/]+)$ {
nchan_subscriber;
@ -164,7 +145,6 @@ server {
# deny access to .htaccess files, if Apache's document root
# concurs with nginx's one
#
location ~ /\.ht {
deny all;
}

2
util/ansible/update.yml
View File

@ -28,7 +28,7 @@
when: update_revision|int < 87
- role: "nginx"
when: update_revision|int < 88
when: update_revision|int < 89
- role: "redis"
when: update_revision|int < 87

17
util/docker/web/nginx/azuracast.conf.tmpl
View File

@ -137,23 +137,6 @@ server {
return 404;
}
# Reverse proxy all possible radio listening ports (8000, 8010...8480, 8490)
{{ if eq .Env.NGINX_RADIO_PORTS "default" }}
location ~ ^/radio/(8[0-9][0-9]0)(/?)(.*)$ {
{{ else }}
location ~ ^/radio/{{ .Env.NGINX_RADIO_PORTS }}(/?)(.*)$ {
{{ end }}
include proxy_params;
proxy_intercept_errors on;
proxy_next_upstream error timeout invalid_header;
proxy_redirect off;
proxy_connect_timeout 60;
proxy_set_header Host localhost:$1;
proxy_pass http://127.0.0.1:$1/$3?$args;
}
# pub/sub endpoints
location ~ /api/live/nowplaying/([^\/]+)$ {
nchan_access_control_allow_origin "*";