From 2274711c1980f4ff34968ad2a2c8a7e73107a9ac Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Sun, 29 Dec 2024 18:19:03 -0500 Subject: [PATCH] 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 Reviewed-by: Sunil Mohan Adapa --- plinth/modules/mumble/privileged.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plinth/modules/mumble/privileged.py b/plinth/modules/mumble/privileged.py index 6e155eedf..a36a4583a 100644 --- a/plinth/modules/mumble/privileged.py +++ b/plinth/modules/mumble/privileged.py @@ -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