Merge PR #23: Don't set welcometext if welcometextfile is set

Fixes: #22
pull/29/head
Robert Adam 2022-09-16 10:00:39 +02:00 zatwierdzone przez GitHub
commit b0f19ab2c2
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 5 dodań i 1 usunięć

Wyświetl plik

@ -108,7 +108,11 @@ else
set_config "database" "${DATA_DIR}/mumble-server.sqlite" true
set_config "ice" "\"tcp -h 127.0.0.1 -p 6502\"" true
set_config "welcometext" "\"<br />Welcome to this server, running the official Mumble Docker image.<br />Enjoy your stay!<br />\"" true
if ! array_contains "used_configs" "welcometextfile"; then
set_config "welcometext" "\"<br />Welcome to this server, running the official Mumble Docker image.<br />Enjoy your stay!<br />\"" true
fi
set_config "port" 64738 true
set_config "users" 100 true