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

global setting: make sure to run migration 25 prior to the regenconf

Browse source
This commit is contained in:
Alexandre Aubin 2022-10-27 16:20:08 +02:00
parent 0026de50f9
commit f3750598e3
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tools.py
View file

@ -277,6 +277,16 @@ def tools_postinstall(
def tools_regen_conf( def tools_regen_conf(
names=[], with_diff=False, force=False, dry_run=False, list_pending=False names=[], with_diff=False, force=False, dry_run=False, list_pending=False
): ):
# Make sure the settings are migrated before running the migration,
# which may otherwise fuck things up such as the ssh config ...
# We do this here because the regen-conf is called before the migration in debian/postinst
if os.path.exists("/etc/yunohost/settings.json") and not os.path.exists("/etc/yunohost/settings.yml"):
try:
tools_migrations_run(["0025_global_settings_to_configpanel"])
except Exception as e:
logger.error(e)
return regen_conf(names, with_diff, force, dry_run, list_pending) return regen_conf(names, with_diff, force, dry_run, list_pending)