From 51171b84bf0a8c30b46170ee7a040bc6d655f54b Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 10 Sep 2019 22:24:49 +0200
Subject: [PATCH] main.metronome -> main.xmpp

---
 data/other/ldap_scheme.yml                  |  4 ++--
 data/templates/metronome/domain.tpl.cfg.lua |  2 +-
 src/yunohost/backup.py                      |  4 ++--
 src/yunohost/tests/test_permission.py       | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/other/ldap_scheme.yml b/data/other/ldap_scheme.yml
index 11504bbe8..d013149af 100644
--- a/data/other/ldap_scheme.yml
+++ b/data/other/ldap_scheme.yml
@@ -67,8 +67,8 @@ depends_children:
             - permissionYnh
         groupPermission:
             - "cn=all_users,ou=groups,dc=yunohost,dc=org"
-    cn=main.metronome,ou=permission:
-        cn: main.metronome
+    cn=main.xmpp,ou=permission:
+        cn: main.xmpp
         gidNumber: "5002"
         objectClass:
             - posixGroup
diff --git a/data/templates/metronome/domain.tpl.cfg.lua b/data/templates/metronome/domain.tpl.cfg.lua
index 2ee9cfaae..d523365db 100644
--- a/data/templates/metronome/domain.tpl.cfg.lua
+++ b/data/templates/metronome/domain.tpl.cfg.lua
@@ -8,7 +8,7 @@ VirtualHost "{{ domain }}"
      hostname      = "localhost",
      user = {
        basedn        = "ou=users,dc=yunohost,dc=org",
-       filter        = "(&(objectClass=posixAccount)(mail=*@{{ domain }})(permission=cn=main.metronome,ou=permission,dc=yunohost,dc=org))",
+       filter        = "(&(objectClass=posixAccount)(mail=*@{{ domain }})(permission=cn=main.xmpp,ou=permission,dc=yunohost,dc=org))",
        usernamefield = "mail",
        namefield     = "cn",
        },
diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py
index bd5d5750d..55b6678b8 100644
--- a/src/yunohost/backup.py
+++ b/src/yunohost/backup.py
@@ -1191,7 +1191,7 @@ class RestoreManager():
         old_apps_permission = []
         try:
             old_apps_permission = ldap.search('ou=permission,dc=yunohost,dc=org',
-                                              '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.metronome))(!(cn=main.sftp)))',
+                                              '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.xmpp))(!(cn=main.sftp)))',
                                               ['cn', 'objectClass', 'groupPermission', 'URL', 'gidNumber'])
         except:
             logger.info(m18n.n('apps_permission_not_found'))
@@ -1247,7 +1247,7 @@ class RestoreManager():
 
         # Remove all permission for all app which sill in the LDAP
         for per in ldap.search('ou=permission,dc=yunohost,dc=org',
-                               '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.metronome))(!(cn=main.sftp)))',
+                               '(&(objectClass=permissionYnh)(!(cn=main.mail))(!(cn=main.xmpp))(!(cn=main.sftp)))',
                                ['cn']):
             if not ldap.remove('cn=%s,ou=permission' % per['cn'][0]):
                 raise YunohostError('permission_deletion_failed',
diff --git a/src/yunohost/tests/test_permission.py b/src/yunohost/tests/test_permission.py
index d309a8211..3b9815f63 100644
--- a/src/yunohost/tests/test_permission.py
+++ b/src/yunohost/tests/test_permission.py
@@ -135,7 +135,7 @@ def check_LDAP_db_integrity():
 def check_permission_for_apps():
     # We check that the for each installed apps we have at last the "main" permission
     # and we don't have any permission linked to no apps. The only exception who is not liked to an app
-    # is mail, metronome, and sftp
+    # is mail, xmpp, and sftp
 
     from yunohost.utils.ldap import _get_ldap_interface
     ldap = _get_ldap_interface()
@@ -146,7 +146,7 @@ def check_permission_for_apps():
     installed_apps = {app['id'] for app in app_list(installed=True)['apps']}
     permission_list_set = {permission['cn'][0].split(".")[1] for permission in permission_search}
 
-    extra_service_permission = set(['mail', 'metronome'])
+    extra_service_permission = set(['mail', 'xmpp'])
     if 'sftp' in permission_list_set:
         extra_service_permission.add('sftp')
     assert installed_apps == permission_list_set - extra_service_permission
@@ -164,8 +164,8 @@ def test_list_permission():
     assert "main" in res['blog']
     assert "mail" in res
     assert "main" in res['mail']
-    assert "metronome" in res
-    assert "main" in res['metronome']
+    assert "xmpp" in res
+    assert "main" in res['xmpp']
     assert ["all_users"] == res['wiki']['main']['allowed_groups']
     assert ["alice"] == res['blog']['main']['allowed_groups']
     assert set(["alice", "bob"]) == set(res['wiki']['main']['allowed_users'])
@@ -220,9 +220,9 @@ def test_remove_bad_permission():
     assert "blog" in res
     assert "main" in res['blog']
     assert "mail" in res
-    assert "main" in res ['mail']
-    assert "metronome" in res
-    assert "main" in res['metronome']
+    assert "main" in res['mail']
+    assert "xmpp" in res
+    assert "main" in res['xmpp']
 
 def test_remove_main_permission():
     with pytest.raises(YunohostError):