Redo Nextcloud redis intergration

This commit is contained in:
Niels Bouma 2023-03-29 12:29:01 +02:00 committed by GitHub
parent 4cd5a77955
commit 2ea62c3d31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -730,23 +730,19 @@ nextcloud_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_bas
nextcloud_uid: "{{ mash_playbook_uid }}" nextcloud_uid: "{{ mash_playbook_uid }}"
nextcloud_gid: "{{ mash_playbook_gid }}" nextcloud_gid: "{{ mash_playbook_gid }}"
nextcloud_systemd_required_systemd_services_list: | nextcloud_systemd_required_services_list_auto: |
{{ {{
(['docker.service']) (['docker.service'])
+ +
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and nextcloud_database_hostname == devture_postgres_identifier else []) ([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and nextcloud_database_hostname == devture_postgres_identifier else [])
+
([redis_identifier ~ '.service'] if redis_enabled and nextcloud_redis_enabled and nextcloud_redis_hostname == redis_identifier else [])
}} }}
nextcloud_container_additional_networks: | nextcloud_container_additional_networks_auto: |
{{ {{
( (
([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else []) ([mash_playbook_reverse_proxyable_services_additional_network] if mash_playbook_reverse_proxyable_services_additional_network else [])
+ +
([devture_postgres_container_network] if devture_postgres_enabled and nextcloud_database_hostname == devture_postgres_identifier and nextcloud_container_network != devture_postgres_container_network else []) ([devture_postgres_container_network] if devture_postgres_enabled and nextcloud_database_hostname == devture_postgres_identifier and nextcloud_container_network != devture_postgres_container_network else [])
+
([redis_container_network] if redis_enabled and nextcloud_redis_enabled and nextcloud_redis_hostname == redis_identifier else [])
) | unique ) | unique
}} }}
@ -760,9 +756,6 @@ nextcloud_database_port: "{{ '5432' if devture_postgres_enabled else '' }}"
nextcloud_database_username: "nextcloud" nextcloud_database_username: "nextcloud"
nextcloud_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.nextcloud', rounds=655555) | to_uuid }}" nextcloud_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.nextcloud', rounds=655555) | to_uuid }}"
nextcloud_redis_enabled: false
nextcloud_redis_hostname: "{{ redis_identifier if redis_enabled and nextcloud_redis_enabled else '' }}"
######################################################################## ########################################################################
# # # #
# /nextcloud # # /nextcloud #