nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

radicale: Use rights file by default for radicale 2.x

Browse Source 
The default rights file shipped in radicale 2.x package is equivalent
to owner_only. By setting this as our default, we can avoid any change
to the default config.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2019-01-23 22:42:57 -05:00 committed by Sunil Mohan Adapa
parent bb29e0932e
commit 24f1967b6a
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
actions/radicale
View File

@ -59,9 +59,6 @@ def subcommand_setup(_):
if current_version and current_version < radicale.VERSION_2: if current_version and current_version < radicale.VERSION_2:
aug.set('/files' + DEFAULT_FILE + '/ENABLE_RADICALE', 'yes') aug.set('/files' + DEFAULT_FILE + '/ENABLE_RADICALE', 'yes')
aug.set('/files' + CONFIG_FILE + '/rights/type', 'owner_only')
if current_version and current_version < radicale.VERSION_2:
aug.set('/files' + CONFIG_FILE + '/server/hosts', aug.set('/files' + CONFIG_FILE + '/server/hosts',
'127.0.0.1:5232, [::1]:5232') '127.0.0.1:5232, [::1]:5232')
aug.set('/files' + CONFIG_FILE + '/server/base_prefix', '/radicale/') aug.set('/files' + CONFIG_FILE + '/server/base_prefix', '/radicale/')
@ -70,6 +67,7 @@ def subcommand_setup(_):
aug.set('/files' + CONFIG_FILE + '/well-known/carddav', aug.set('/files' + CONFIG_FILE + '/well-known/carddav',
'/radicale/%(user)s/carddav/') '/radicale/%(user)s/carddav/')
aug.set('/files' + CONFIG_FILE + '/auth/type', 'remote_user') aug.set('/files' + CONFIG_FILE + '/auth/type', 'remote_user')
aug.set('/files' + CONFIG_FILE + '/rights/type', 'owner_only')
aug.save() aug.save()
@ -78,6 +76,15 @@ def subcommand_setup(_):
def subcommand_configure(arguments): def subcommand_configure(arguments):
"""Sets the radicale rights type to a particular value""" """Sets the radicale rights type to a particular value"""
current_version = radicale.get_package_version()
if not current_version:
print('Warning: Unable to get radicale version.')
if current_version and current_version >= radicale.VERSION_2:
if arguments.rights_type == 'owner_only':
# Radicale 2.x default rights file is equivalent to owner_only.
arguments.rights_type = 'from_file'
aug = load_augeas() aug = load_augeas()
aug.set('/files' + CONFIG_FILE + '/rights/type', arguments.rights_type) aug.set('/files' + CONFIG_FILE + '/rights/type', arguments.rights_type)
aug.save() aug.save()

7
plinth/modules/radicale/__init__.py
View File

@ -177,6 +177,13 @@ def get_rights_value():
"""Returns the current Rights value.""" """Returns the current Rights value."""
aug = load_augeas() aug = load_augeas()
value = aug.get('/files' + CONFIG_FILE + '/rights/type') value = aug.get('/files' + CONFIG_FILE + '/rights/type')
current_version = get_package_version()
if current_version and current_version >= VERSION_2:
if value == 'from_file':
# Radicale 2.x default rights file is equivalent to owner_only.
value = 'owner_only'
return value return value