mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-21 07:55:00 +00:00
mumble: Support config file moved into /etc/mumble
Tests: - In testing container, install Mumble. /etc/mumble/mumble-server.ini has settings for ssl cert and key. - In stable container, install Mumble. /etc/mumble-server.ini has settings for ssl cert and key. Signed-off-by: James Valleroy <jvalleroy@mailbox.org> Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
parent
69a18565ea
commit
2274711c19
@ -11,7 +11,8 @@ import augeas
|
||||
from plinth import action_utils
|
||||
from plinth.actions import privileged, secret_str
|
||||
|
||||
CONFIG_FILE = '/etc/mumble-server.ini'
|
||||
CONFIG_FILE = '/etc/mumble/mumble-server.ini'
|
||||
OLD_CONFIG_FILE = '/etc/mumble-server.ini'
|
||||
DATA_DIR = '/var/lib/mumble-server'
|
||||
|
||||
|
||||
@ -79,8 +80,10 @@ def _load_augeas():
|
||||
"""Initialize Augeas."""
|
||||
aug = augeas.Augeas(flags=augeas.Augeas.NO_LOAD +
|
||||
augeas.Augeas.NO_MODL_AUTOLOAD)
|
||||
aug.transform('Php', CONFIG_FILE)
|
||||
aug.set('/augeas/context', '/files' + CONFIG_FILE)
|
||||
config_file = CONFIG_FILE if pathlib.Path(CONFIG_FILE).exists() \
|
||||
else OLD_CONFIG_FILE
|
||||
aug.transform('Php', config_file)
|
||||
aug.set('/augeas/context', '/files' + config_file)
|
||||
aug.load()
|
||||
|
||||
return aug
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user