mirror of
https://github.com/AzuraCast/AzuraCast.git
synced 2024-06-13 20:56:36 +00:00
Update Centrifugo and switch to TOML markup for parsing fixes.
This commit is contained in:
parent
9b3106eb7f
commit
cd66da17ad
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
# Golang dependencies build step
|
# Golang dependencies build step
|
||||||
#
|
#
|
||||||
FROM golang:1.21-bookworm AS go-dependencies
|
FROM golang:1.22-bookworm AS go-dependencies
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends openssl git
|
&& apt-get install -y --no-install-recommends openssl git
|
||||||
|
@ -10,7 +10,7 @@ RUN go install github.com/jwilder/dockerize@v0.6.1
|
||||||
|
|
||||||
RUN go install github.com/aptible/supercronic@v0.2.28
|
RUN go install github.com/aptible/supercronic@v0.2.28
|
||||||
|
|
||||||
RUN go install github.com/centrifugal/centrifugo/v5@v5.2.2
|
RUN go install github.com/centrifugal/centrifugo/v5@v5.3.0
|
||||||
|
|
||||||
#
|
#
|
||||||
# MariaDB dependencies build step
|
# MariaDB dependencies build step
|
||||||
|
|
39
util/docker/web/centrifugo/config.toml.tmpl
Normal file
39
util/docker/web/centrifugo/config.toml.tmpl
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
allow_anonymous_connect_without_token = true
|
||||||
|
api_insecure = true
|
||||||
|
admin = true
|
||||||
|
admin_insecure = true
|
||||||
|
port = 6_020
|
||||||
|
internal_port = 6_025
|
||||||
|
websocket_disable = true
|
||||||
|
uni_websocket = true
|
||||||
|
uni_sse = true
|
||||||
|
uni_http_stream = true
|
||||||
|
proxy_connect_endpoint = "grpc://127.0.0.1:6300"
|
||||||
|
proxy_connect_timeout = "10s"
|
||||||
|
grpc_api = true
|
||||||
|
grpc_api_port = 6_301
|
||||||
|
allowed_origins = ["*"]
|
||||||
|
|
||||||
|
{{ if isTrue .Env.ENABLE_REDIS }}
|
||||||
|
engine = "redis"
|
||||||
|
redis_address = "{{ .Env.REDIS_HOST }}:{{ default .Env.REDIS_PORT "6379" }}"
|
||||||
|
redis_db = 0
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
|
[[namespaces]]
|
||||||
|
name = "station"
|
||||||
|
history_size = 1
|
||||||
|
history_ttl = "30s"
|
||||||
|
allow_subscribe_for_client = true
|
||||||
|
allow_subscribe_for_anonymous = true
|
||||||
|
allow_history_for_client = true
|
||||||
|
allow_history_for_anonymous = true
|
||||||
|
|
||||||
|
[[namespaces]]
|
||||||
|
name = "global"
|
||||||
|
history_size = 1
|
||||||
|
history_ttl = "2m"
|
||||||
|
allow_subscribe_for_client = true
|
||||||
|
allow_subscribe_for_anonymous = true
|
||||||
|
allow_history_for_client = true
|
||||||
|
allow_history_for_anonymous = true
|
|
@ -1,38 +0,0 @@
|
||||||
allow_anonymous_connect_without_token: true
|
|
||||||
api_insecure: true
|
|
||||||
admin: true
|
|
||||||
admin_insecure: true
|
|
||||||
port: 6020
|
|
||||||
internal_port: 6025
|
|
||||||
websocket_disable: true
|
|
||||||
uni_websocket: true
|
|
||||||
uni_sse: true
|
|
||||||
uni_http_stream: true
|
|
||||||
proxy_connect_endpoint: grpc://127.0.0.1:6300
|
|
||||||
proxy_connect_timeout: 10s
|
|
||||||
grpc_api: true
|
|
||||||
grpc_api_port: 6301
|
|
||||||
allowed_origins:
|
|
||||||
- "*"
|
|
||||||
|
|
||||||
namespaces:
|
|
||||||
- name: "station"
|
|
||||||
history_size: 1
|
|
||||||
history_ttl: "30s"
|
|
||||||
allow_subscribe_for_client: true
|
|
||||||
allow_subscribe_for_anonymous: true
|
|
||||||
allow_history_for_client: true
|
|
||||||
allow_history_for_anonymous: true
|
|
||||||
|
|
||||||
- name: "global"
|
|
||||||
history_size: 0
|
|
||||||
allow_subscribe_for_client: true
|
|
||||||
allow_subscribe_for_anonymous: true
|
|
||||||
allow_history_for_client: true
|
|
||||||
allow_history_for_anonymous: true
|
|
||||||
|
|
||||||
{{if isTrue .Env.ENABLE_REDIS }}
|
|
||||||
engine: "redis"
|
|
||||||
redis_address: "{{ .Env.REDIS_HOST }}:{{ default .Env.REDIS_PORT "6379" }}"
|
|
||||||
redis_db: 0
|
|
||||||
{{end}}
|
|
|
@ -1,6 +1,6 @@
|
||||||
[program:centrifugo]
|
[program:centrifugo]
|
||||||
directory=/var/azuracast/centrifugo
|
directory=/var/azuracast/centrifugo
|
||||||
command=centrifugo -c /var/azuracast/centrifugo/config.yaml
|
command=centrifugo -c /var/azuracast/centrifugo/config.toml
|
||||||
user=azuracast
|
user=azuracast
|
||||||
priority=700
|
priority=700
|
||||||
numprocs=1
|
numprocs=1
|
||||||
|
|
|
@ -3,4 +3,4 @@ set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
mkdir -p /var/azuracast/centrifugo
|
mkdir -p /var/azuracast/centrifugo
|
||||||
cp /bd_build/web/centrifugo/config.yaml.tmpl /var/azuracast/centrifugo/config.yaml.tmpl
|
cp /bd_build/web/centrifugo/config.toml.tmpl /var/azuracast/centrifugo/config.toml.tmpl
|
||||||
|
|
|
@ -3,4 +3,4 @@
|
||||||
ENABLE_REDIS=${ENABLE_REDIS:-true}
|
ENABLE_REDIS=${ENABLE_REDIS:-true}
|
||||||
export ENABLE_REDIS
|
export ENABLE_REDIS
|
||||||
|
|
||||||
dockerize -template "/var/azuracast/centrifugo/config.yaml.tmpl:/var/azuracast/centrifugo/config.yaml"
|
dockerize -template "/var/azuracast/centrifugo/config.toml.tmpl:/var/azuracast/centrifugo/config.toml"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user