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

backup: fix full backup restore postinstall calls that now need first username+fullname+password

Browse source
This commit is contained in:
Alexandre Aubin 2023-02-08 22:46:03 +01:00
parent 024db62a1d
commit 48e488f89e
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/backup.py
View file

@ -32,6 +32,7 @@ from functools import reduce
from packaging import version from packaging import version
from moulinette import Moulinette, m18n from moulinette import Moulinette, m18n
from moulinette.utils.text import random_ascii
from moulinette.utils.log import getActionLogger from moulinette.utils.log import getActionLogger
from moulinette.utils.filesystem import ( from moulinette.utils.filesystem import (
read_file, read_file,
@ -936,7 +937,10 @@ class RestoreManager:
) )
logger.debug("executing the post-install...") logger.debug("executing the post-install...")
tools_postinstall(domain, "Yunohost", True)
# Use a dummy password which is not gonna be saved anywhere
# because the next thing to happen should be that a full restore of the LDAP db will happen
tools_postinstall(domain, "admin", "Admin", password=random_ascii(70), ignore_dyndns=True, overwrite_root_password=False)
def clean(self): def clean(self):
""" """

6
src/tools.py
View file

@ -152,6 +152,7 @@ def tools_postinstall(
password, password,
ignore_dyndns=False, ignore_dyndns=False,
force_diskspace=False, force_diskspace=False,
overwrite_root_password=True,
): ):
from yunohost.dyndns import _dyndns_available from yunohost.dyndns import _dyndns_available
from yunohost.utils.dns import is_yunohost_dyndns_domain from yunohost.utils.dns import is_yunohost_dyndns_domain
@ -225,10 +226,11 @@ def tools_postinstall(
domain_add(domain, dyndns) domain_add(domain, dyndns)
domain_main_domain(domain) domain_main_domain(domain)
# First user
user_create(username, domain, password, admin=True, fullname=fullname) user_create(username, domain, password, admin=True, fullname=fullname)
# Update LDAP admin and create home dir if overwrite_root_password:
tools_rootpw(password) tools_rootpw(password)
# Enable UPnP silently and reload firewall # Enable UPnP silently and reload firewall
firewall_upnp("enable", no_refresh=True) firewall_upnp("enable", no_refresh=True)