mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
config_settings.toml -> config_global.toml
This commit is contained in:
parent
5d685cebf0
commit
76238db4bb
3 changed files with 3 additions and 6 deletions
|
@ -44,7 +44,6 @@ from yunohost.log import is_unit_operation
|
|||
|
||||
logger = getActionLogger("yunohost.domain")
|
||||
|
||||
DOMAIN_CONFIG_PATH = "/usr/share/yunohost/config_domain.toml"
|
||||
DOMAIN_SETTINGS_DIR = "/etc/yunohost/domains"
|
||||
|
||||
# Lazy dev caching to avoid re-query ldap every time we need the domain list
|
||||
|
|
|
@ -6,8 +6,6 @@ import pytest
|
|||
import moulinette
|
||||
from yunohost.utils.error import YunohostError, YunohostValidationError
|
||||
|
||||
import yunohost.settings as settings
|
||||
|
||||
from yunohost.settings import (
|
||||
settings_get,
|
||||
settings_list,
|
||||
|
@ -45,8 +43,8 @@ def setup_function(function):
|
|||
if os.path.exists(SETTINGS_PATH):
|
||||
os.system(f"mv {SETTINGS_PATH} {SETTINGS_PATH}.saved")
|
||||
# Add example settings to config panel
|
||||
os.system("cp /usr/share/yunohost/config_settings.toml /usr/share/yunohost/config_settings.toml.saved")
|
||||
with open("/usr/share/yunohost/config_settings.toml", "a") as file:
|
||||
os.system("cp /usr/share/yunohost/config_global.toml /usr/share/yunohost/config_global.toml.saved")
|
||||
with open("/usr/share/yunohost/config_global.toml", "a") as file:
|
||||
file.write(EXAMPLE_SETTINGS)
|
||||
|
||||
|
||||
|
@ -55,7 +53,7 @@ def teardown_function(function):
|
|||
os.system(f"mv {SETTINGS_PATH}.saved {SETTINGS_PATH}")
|
||||
elif os.path.exists(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
|
||||
|
|
Loading…
Add table
Reference in a new issue