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

Fix postinstall and backup restore

Browse source
This commit is contained in:
Josué Tille 2020-04-06 11:40:35 +02:00
parent 8443e9c448
commit 0828eec729
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/other/ldap_scheme.yml
View file

@ -73,6 +73,9 @@ depends_children:
- permissionYnh - permissionYnh
groupPermission: groupPermission:
- "cn=all_users,ou=groups,dc=yunohost,dc=org" - "cn=all_users,ou=groups,dc=yunohost,dc=org"
authHeader: "FALSE"
label: "Mail"
showTile: "FALSE"
isProtected: "TRUE" isProtected: "TRUE"
cn=xmpp.main,ou=permission: cn=xmpp.main,ou=permission:
cn: xmpp.main cn: xmpp.main
@ -82,4 +85,7 @@ depends_children:
- permissionYnh - permissionYnh
groupPermission: groupPermission:
- "cn=all_users,ou=groups,dc=yunohost,dc=org" - "cn=all_users,ou=groups,dc=yunohost,dc=org"
authHeader: "FALSE"
label: "XMPP"
showTile: "FALSE"
isProtected: "TRUE" isProtected: "TRUE"

7
src/yunohost/backup.py
View file

@ -1247,7 +1247,12 @@ class RestoreManager():
for permission_name, permission_infos in old_apps_permission.items(): for permission_name, permission_infos in old_apps_permission.items():
app_name = permission_name.split(".")[0] app_name = permission_name.split(".")[0]
if _is_installed(app_name): if _is_installed(app_name):
permission_create(permission_name, url=permission_infos["url"], allowed=permission_infos["allowed"], permission_create(permission_name, allowed=permission_infos["allowed"],
url=permission_infos["url"],
additional_urls=permission_infos['additional_urls'],
auth_header=permission_infos['auth_header'],
label=permission_infos['label'],
show_tile=permission_infos['show_tile'],
protected=permission_infos["protected"], sync_perm=False) protected=permission_infos["protected"], sync_perm=False)
permission_sync_to_user() permission_sync_to_user()

2
src/yunohost/data_migrations/0015_extends_permissions_features_1.py
View file

@ -41,7 +41,7 @@ class MyMigration(Migration):
if permission.split('.')[0] in SYSTEM_PERMS: if permission.split('.')[0] in SYSTEM_PERMS:
ldap.update('cn=%s,ou=permission' % permission, { ldap.update('cn=%s,ou=permission' % permission, {
'authHeader': ["FALSE"], 'authHeader': ["FALSE"],
'label': [permission.split('.')[0]], 'label': [permission.split('.')[0].title()],
'showTile': ["FALSE"], 'showTile': ["FALSE"],
'isProtected': ["TRUE"], 'isProtected': ["TRUE"],
}) })