Merge pull request #200 from Bergruebe/main

feat: paperless support exim-relay & generate paperless-secret-key
This commit is contained in:
Slavi Pantaleev 2024-05-06 10:20:09 +03:00 committed by GitHub
commit fb6d3aebd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -4104,6 +4104,8 @@ paperless_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_bas
paperless_uid: "{{ mash_playbook_uid }}"
paperless_gid: "{{ mash_playbook_gid }}"
paperless_secret_key: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'paperless_secret_key', rounds=655555) | to_uuid }}"
paperless_database_hostname: "{{ devture_postgres_identifier if devture_postgres_enabled else '' }}"
paperless_database_username: "paperless"
paperless_database_port: "{{ '5432' if devture_postgres_enabled else '' }}"
@ -4121,6 +4123,8 @@ paperless_container_additional_networks_auto: |
([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 paperless_database_hostname == devture_postgres_identifier and paperless_container_network != devture_postgres_container_network else [])
+
([exim_relay_container_network | default('mash-exim-relay')] if (exim_relay_enabled | default(false) and paperless_email_host == exim_relay_identifier | default('mash-exim-relay') and paperless_container_network != exim_relay_container_network) else [])
}}
paperless_container_labels_traefik_enabled: "{{ mash_playbook_traefik_labels_enabled }}"
@ -4128,6 +4132,12 @@ paperless_container_labels_traefik_docker_network: "{{ mash_playbook_reverse_pro
paperless_container_labels_traefik_entrypoints: "{{ devture_traefik_entrypoint_primary }}"
paperless_container_labels_traefik_tls_certResolver: "{{ devture_traefik_certResolver_primary }}"
# role-specific:exim_relay
paperless_email_host: "{{ exim_relay_identifier if exim_relay_enabled else '' }}"
paperless_email_port: "{{ 8025 if exim_relay_enabled else '' }}"
paperless_email_from: "{{ exim_relay_sender_address if exim_relay_enabled else '' }}"
# /role-specific:exim_relay
########################################################################
# #
# /paperless #