Switch to using some newly-added _auto variables for Focalboard and Syncthing
This commit is contained in:
parent
b694cc27bd
commit
02433c1d22
1 changed files with 3 additions and 5 deletions
|
@ -658,10 +658,8 @@ focalboard_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_ba
|
||||||
focalboard_uid: "{{ mash_playbook_uid }}"
|
focalboard_uid: "{{ mash_playbook_uid }}"
|
||||||
focalboard_gid: "{{ mash_playbook_gid }}"
|
focalboard_gid: "{{ mash_playbook_gid }}"
|
||||||
|
|
||||||
focalboard_systemd_required_systemd_services_list: |
|
focalboard_systemd_required_systemd_services_list_auto: |
|
||||||
{{
|
{{
|
||||||
(['docker.service'])
|
|
||||||
+
|
|
||||||
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and focalboard_database_hostname == devture_postgres_identifier else [])
|
([devture_postgres_identifier ~ '.service'] if devture_postgres_enabled and focalboard_database_hostname == devture_postgres_identifier else [])
|
||||||
}}
|
}}
|
||||||
|
|
||||||
|
@ -670,7 +668,7 @@ focalboard_database_hostname: "{{ devture_postgres_identifier if devture_postgre
|
||||||
focalboard_database_port: "{{ '5432' if devture_postgres_enabled else '' }}"
|
focalboard_database_port: "{{ '5432' if devture_postgres_enabled else '' }}"
|
||||||
focalboard_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.focalboard', rounds=655555) | to_uuid }}"
|
focalboard_database_password: "{{ '%s' | format(mash_playbook_generic_secret_key) | password_hash('sha512', 'db.focalboard', rounds=655555) | to_uuid }}"
|
||||||
|
|
||||||
focalboard_container_additional_networks: |
|
focalboard_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 [])
|
||||||
+
|
+
|
||||||
|
@ -1627,7 +1625,7 @@ syncthing_gid: "{{ mash_playbook_gid }}"
|
||||||
|
|
||||||
syncthing_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_base_directory_name_prefix }}syncthing"
|
syncthing_base_path: "{{ mash_playbook_base_path }}/{{ mash_playbook_service_base_directory_name_prefix }}syncthing"
|
||||||
|
|
||||||
syncthing_container_additional_networks: |
|
syncthing_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 [])
|
||||||
}}
|
}}
|
||||||
|
|
Loading…
Add table
Reference in a new issue