mirror
/
mumble-docker
kopia lustrzana https://github.com/mumble-voip/mumble-docker
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge PR #14: Add toggle to allow "unknown" settings

pull/17/head
Robert Adam 2022-07-01 14:28:29 +02:00 zatwierdzone przez GitHub
rodzic 6535e9dfc0 a5dec0c874
commit 4d73da6902
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 28 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

24
README.md
Wyświetl plik

@ -91,11 +91,25 @@ $ docker run -e "MUMBLE_CONFIG_SERVER_PASSWORD=123"
The following _additional_ variables can be set for further server configuration:
| Environment Variable | Description |
|-----------------------------|--------------------------------------------------------------------------------------------------------------------------------------------- |
| `MUMBLE_CUSTOM_CONFIG_FILE` | Specify a custom config file path - **all `MUMBLE_CONFIG_` variables are IGNORED** <br/>(it's best to use a path inside the volume `/data/`) |
| `MUMBLE_SUPERUSER_PASSWORD` | Specifies the SuperUser (Admin) password for this server. If this is not given, a random password will be generated upon first startup. |
| `MUMBLE_VERBOSE` | Set to `true` to enable verbose logging in the server |
| Environment Variable | Description |
|----------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------- |
| `MUMBLE_ACCEPT_UNKNOWN_SETTINGS` | Set to `true` to force the container to accept unknown settings passed as a `MUMBLE_CONFIG_` variable (see note below). |
| `MUMBLE_CUSTOM_CONFIG_FILE` | Specify a custom config file path - **all `MUMBLE_CONFIG_` variables are IGNORED** <br/>(it's best to use a path inside the volume `/data/`) |
| `MUMBLE_SUPERUSER_PASSWORD` | Specifies the SuperUser (Admin) password for this server. If this is not given, a random password will be generated upon first startup. |
| `MUMBLE_VERBOSE` | Set to `true` to enable verbose logging in the server |
Note: In the unlikely case where a `<configName>` setting is unknown to the container, startup will fail with the following error.
```
mumble-server | [ERROR]: Unable to find config corresponding to variable "<configName>"
mumble-server exited with code 1
```
The root cause of this error is the fact that this setting is incorrectly registered in the Mumble server code. You can workaround this error by
setting the `MUMBLE_ACCEPT_UNKNOWN_SETTINGS` environment variable to `true` and spelling `<configName>` exactly as written in the
[Murmur.ini](https://wiki.mumble.info/wiki/Murmur.ini) documentation.
## Building the container

12
entrypoint.sh
Wyświetl plik

@ -69,11 +69,17 @@ else
config_option="${option_for[$(normalize_name "$var")]}"
if [[ -z "$config_option" ]]; then
>&2 echo "[ERROR]: Unable to find config corresponding to variable \"$var\""
exit 1
if [[ "$MUMBLE_ACCEPT_UNKNOWN_SETTINGS" = true ]]; then
echo "[WARNING]: Unable to find config corresponding to variable \"$var\". Make sure that it is correctly spelled, using it as-is"
set_config "$var" "$value"
else
>&2 echo "[ERROR]: Unable to find config corresponding to variable \"$var\""
exit 1
fi
else
set_config "$config_option" "$value"
fi
set_config "$config_option" "$value"
done < <( printenv --null | sed -zn 's/^MUMBLE_CONFIG_//p' )
# ^ Feeding it in like this, prevents the creation of a subshell for the while-loop