service: Actually do something with service_additional_containers
This commit is contained in:
@@ -5,7 +5,9 @@ _service_host_directory: "/srv/{{ service_name }}"
|
||||
_service_setup_database: "{{ service_database_type != 'none' }}"
|
||||
_service_database_name: "{{ service_name }}-{{ service_database_type }}"
|
||||
|
||||
_service_container_secrets: >
|
||||
_service_container_networks: "{{ [service_name] + service_container_additional_networks }}"
|
||||
|
||||
_service_container_secrets: >-
|
||||
{{
|
||||
service_container_secrets
|
||||
| map(attribute='name')
|
||||
@@ -21,8 +23,31 @@ _service_container_secrets: >
|
||||
+ ([{'name': _service_database_name, 'target': service_database_type }] if _service_setup_database else [])
|
||||
}}
|
||||
|
||||
_service_container_requires: "{{ service_requires + ([_service_database_name + '.service'] if _service_setup_database else []) }}"
|
||||
_service_container_wants: "{{ service_wants + ([service_name + '-socat.socket'] if service_domains | length > 0 else []) }}"
|
||||
_service_additional_containers: >-
|
||||
{{
|
||||
service_additional_containers
|
||||
| zip(
|
||||
service_additional_containers
|
||||
| map(attribute='name')
|
||||
| map('regex_replace', '^', service_name ~ '-')
|
||||
| map('community.general.dict_kv', 'name')
|
||||
)
|
||||
| map('combine')
|
||||
}}
|
||||
|
||||
_service_container_requires: >-
|
||||
{{
|
||||
service_requires
|
||||
+ ([_service_database_name + '.service'] if _service_setup_database else [])
|
||||
}}
|
||||
_service_container_wants: >-
|
||||
{{
|
||||
service_wants
|
||||
+ ([service_name + '-socat.socket'] if service_domains | length > 0 else [])
|
||||
+ _service_additional_containers
|
||||
| map(attribute='name')
|
||||
| map('regex_replace', '$', '.service')
|
||||
}}
|
||||
|
||||
_service_replacement_host_header:
|
||||
Host: "{{ service_name }}:{{ service_container_http_port }}"
|
||||
|
||||
Reference in New Issue
Block a user