From fe15b316bfc66473fdf53bd98f6208d474ce773d Mon Sep 17 00:00:00 2001 From: Johanna Dorothea Reichmann Date: Sun, 24 Oct 2021 15:59:31 +0200 Subject: [PATCH] chore(server): populate managed config keys conditionally --- roles/server/vars/main.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/roles/server/vars/main.yml b/roles/server/vars/main.yml index 3dbb4d0..b563d44 100644 --- a/roles/server/vars/main.yml +++ b/roles/server/vars/main.yml @@ -25,18 +25,24 @@ nextcloud_container_base_environment_yaml: |+2 PHP_MEMORY_LIMIT: "{{ nextcloud_php_memory_limit }}" PHP_UPLOAD_LIMIT: "{{ nextcloud_php_upload_limit }}" -nextcloud_config: "{{ nextcloud_base_config | combine(nextcloud_extra_config|default({}), recursive=True, list_merge='append') }}" -nextcloud_base_config: +nextcloud_config: "{{ nextcloud_base_config | from_yaml | combine(nextcloud_extra_config|default({}), recursive=True, list_merge='append') }}" +nextcloud_base_config: |+2 + {% if nextcloud_database_type != 'sqlite' %} system: - # TODO: needs to have conditions as f.ex. sqlite doesn't have a user dbhost: "{{ nextcloud_database_host }}" dbuser: "{{ nextcloud_database_user }}" dbpassword: "{{ nextcloud_database_pass }}" dbname: "{{ nextcloud_database_name }}" - #dbtype: "{{ nextcloud_db_types[nextcloud_database_type] }}" + dbtype: "{{ nextcloud_database_types[nextcloud_database_type] }}" + {% endif %} app: core: backgroundjobs_mode: "{{ nextcloud_background_job_mode }}" nextcloud_occ_command: "php occ" nextcloud_container_php_socket_path: /var/run/php +nextcloud_database_types: + postgres: pgsql + mysql: mysql + mariadb: mysql + sqlite: sqlite3