nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

mumble: Support config file moved into /etc/mumble

Browse Source 
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:
James Valleroy 2024-12-29 18:19:03 -05:00 committed by Sunil Mohan Adapa
parent 69a18565ea
commit 2274711c19
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plinth/modules/mumble/privileged.py
View File

@ -11,7 +11,8 @@ import augeas
from plinth import action_utils from plinth import action_utils
from plinth.actions import privileged, secret_str 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' DATA_DIR = '/var/lib/mumble-server'
@ -79,8 +80,10 @@ def _load_augeas():
"""Initialize Augeas.""" """Initialize Augeas."""
aug = augeas.Augeas(flags=augeas.Augeas.NO_LOAD + aug = augeas.Augeas(flags=augeas.Augeas.NO_LOAD +
augeas.Augeas.NO_MODL_AUTOLOAD) augeas.Augeas.NO_MODL_AUTOLOAD)
aug.transform('Php', CONFIG_FILE) config_file = CONFIG_FILE if pathlib.Path(CONFIG_FILE).exists() \
aug.set('/augeas/context', '/files' + CONFIG_FILE) else OLD_CONFIG_FILE
aug.transform('Php', config_file)
aug.set('/augeas/context', '/files' + config_file)
aug.load() aug.load()
return aug return aug