diff --git a/docs/setup.rst b/docs/setup.rst index b5c3569..1592322 100644 --- a/docs/setup.rst +++ b/docs/setup.rst @@ -4,7 +4,7 @@ Setup .. warning:: - This plugin requires Radicale 2.0 or higher. + This plugin requires Radicale 3.0 or higher. Once `Radicale is installed `_ on your server, you must diff --git a/modoboa_radicale/management/commands/generate_rights.py b/modoboa_radicale/management/commands/generate_rights.py index 7c9abce..bf5d298 100644 --- a/modoboa_radicale/management/commands/generate_rights.py +++ b/modoboa_radicale/management/commands/generate_rights.py @@ -25,15 +25,15 @@ def add_arguments(self, parser): "--force", action="store_true", default=False, help="Force generation of rights file") - def _generate_acr(self, name, user, collection, perm="rw", comment=None): + def _generate_acr(self, name, user, collection, perm="RrWw", comment=None): """Write a new access control rule to the config file.""" if comment is not None: self._cfgfile.write("\n# %s" % comment) self._cfgfile.write(""" [%s] -user = %s -collection = %s -permissions = %s +user: %s +collection: %s +permissions: %s """ % (name, user, collection, perm) ) @@ -45,9 +45,9 @@ def _user_access_rules(self): ) permission = "" if acr.read: - permission += "r" + permission += "Rr" if acr.write: - permission += "w" + permission += "Ww" self._generate_acr( section, acr.mailbox.full_address, acr.calendar.path, permission, @@ -59,7 +59,7 @@ def _token_access_rules(self): for calendar in model.objects.all(): section = "token-{}-access".format(calendar._path) self._generate_acr( - section, calendar.access_token, calendar._path, perm="r", + section, calendar.access_token, calendar._path, perm="Rr", comment="Read-only access using a token" )