YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

config_settings.toml -> config_global.toml

Browse source
This commit is contained in:
Alexandre Aubin 2022-08-04 19:09:47 +02:00
parent 5d685cebf0
commit 76238db4bb
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
share/config_settings.toml → share/config_global.toml
View file

1
src/domain.py
View file

@ -44,7 +44,6 @@ from yunohost.log import is_unit_operation
logger = getActionLogger("yunohost.domain") logger = getActionLogger("yunohost.domain")
DOMAIN_CONFIG_PATH = "/usr/share/yunohost/config_domain.toml"
DOMAIN_SETTINGS_DIR = "/etc/yunohost/domains" DOMAIN_SETTINGS_DIR = "/etc/yunohost/domains"
# Lazy dev caching to avoid re-query ldap every time we need the domain list # Lazy dev caching to avoid re-query ldap every time we need the domain list

8
src/tests/test_settings.py
View file

@ -6,8 +6,6 @@ import pytest
import moulinette import moulinette
from yunohost.utils.error import YunohostError, YunohostValidationError from yunohost.utils.error import YunohostError, YunohostValidationError
import yunohost.settings as settings
from yunohost.settings import ( from yunohost.settings import (
settings_get, settings_get,
settings_list, settings_list,
@ -45,8 +43,8 @@ def setup_function(function):
if os.path.exists(SETTINGS_PATH): if os.path.exists(SETTINGS_PATH):
os.system(f"mv {SETTINGS_PATH} {SETTINGS_PATH}.saved") os.system(f"mv {SETTINGS_PATH} {SETTINGS_PATH}.saved")
# Add example settings to config panel # Add example settings to config panel
os.system("cp /usr/share/yunohost/config_settings.toml /usr/share/yunohost/config_settings.toml.saved") os.system("cp /usr/share/yunohost/config_global.toml /usr/share/yunohost/config_global.toml.saved")
with open("/usr/share/yunohost/config_settings.toml", "a") as file: with open("/usr/share/yunohost/config_global.toml", "a") as file:
file.write(EXAMPLE_SETTINGS) file.write(EXAMPLE_SETTINGS)
@ -55,7 +53,7 @@ def teardown_function(function):
os.system(f"mv {SETTINGS_PATH}.saved {SETTINGS_PATH}") os.system(f"mv {SETTINGS_PATH}.saved {SETTINGS_PATH}")
elif os.path.exists(SETTINGS_PATH): elif os.path.exists(SETTINGS_PATH):
os.remove(SETTINGS_PATH) os.remove(SETTINGS_PATH)
os.system("mv /usr/share/yunohost/config_settings.toml.saved /usr/share/yunohost/config_settings.toml") os.system("mv /usr/share/yunohost/config_global.toml.saved /usr/share/yunohost/config_global.toml")
old_translate = moulinette.core.Translator.translate old_translate = moulinette.core.Translator.translate