From 1cb3ff73ff294bcea0c4afdac5a93bef1eaee025 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 3 Dec 2023 12:41:56 +0200 Subject: [PATCH] Fix typo in variable name (imageick -> imagick) --- defaults/main.yml | 8 ++++---- tasks/validate_config.yml | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index d2c4355..6d0a35b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -84,7 +84,7 @@ nextcloud_preview_app_jpeg_quality: "60" nextcloud_container_image_customizations_enabled: | {{ ( - nextcloud_container_image_customizations_php_imageick_installation_enabled + nextcloud_container_image_customizations_php_imagick_installation_enabled or nextcloud_container_image_customizations_samba_enabled or @@ -98,8 +98,8 @@ nextcloud_container_image_customizations_enabled: | # behind not installing it by default. See: # https://github.com/nextcloud/server/issues/13099 # Tread wisely! -nextcloud_container_image_customizations_php_imageick_installation_enabled: false -nextcloud_container_image_customizations_php_imageick_installation_packages: ['libmagickcore-6.q16-6-extra'] +nextcloud_container_image_customizations_php_imagick_installation_enabled: false +nextcloud_container_image_customizations_php_imagick_installation_packages: ['libmagickcore-6.q16-6-extra'] # Samba (SMB) support for Windows fileshares can be setup using the toggle below, which # installs the smbclient package per the example here https://github.com/nextcloud/docker/blob/master/.examples/dockerfiles/smb/apache/Dockerfile @@ -112,7 +112,7 @@ nextcloud_container_image_customizations_samba_packages: ['procps', 'smbclient'] nextcloud_container_image_customizations_packages_to_install: "{{ (nextcloud_container_image_customizations_packages_to_install_auto + nextcloud_container_image_customizations_packages_to_install_custom) | unique }}" nextcloud_container_image_customizations_packages_to_install_auto: | {{ - (nextcloud_container_image_customizations_php_imageick_installation_packages if nextcloud_container_image_customizations_php_imageick_installation_enabled else []) + (nextcloud_container_image_customizations_php_imageick_installation_packages if nextcloud_container_image_customizations_php_imagick_installation_enabled else []) + (nextcloud_container_image_customizations_samba_packages if nextcloud_container_image_customizations_samba_enabled else []) }} diff --git a/tasks/validate_config.yml b/tasks/validate_config.yml index e7e7184..8d03b1a 100644 --- a/tasks/validate_config.yml +++ b/tasks/validate_config.yml @@ -21,7 +21,8 @@ Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`). when: "vars | dict2items | selectattr('key', item.comparison, item.old) | list | items2dict" with_items: - - {'comparison': 'equalto', 'old': 'nextcloud_container_image_customizations_php_imageick_installation_package', 'new': ''} + - {'comparison': 'equalto', 'old': 'nextcloud_container_image_customizations_php_imageick_installation_enabled', 'new': 'nextcloud_container_image_customizations_php_imagick_installation_enabled'} + - {'comparison': 'equalto', 'old': 'nextcloud_container_image_customizations_php_imageick_installation_package', 'new': ''} - when: nextcloud_container_labels_traefik_enabled | bool block: