service: Improve additional container support

roles/service/vars/main/additional.yaml

@@ -11,6 +11,15 @@ _service_additional_containers: >-
       | map('combine')
   }}
 
+_service_additional_container_wants: >-
+  {{
+    service_wants
+    + _service_additional_container_publish_socket_ports
+        | map(attribute='name')
+        | map('regex_replace', '^', service_name ~ '-')
+        | map('regex_replace', '$', '-socat.socket')
+  }}
+
 _service_additional_container_networks: >-
   {{
     [service_name]
@@ -24,6 +33,24 @@ _service_additional_container_networks: >-
     )
   }}
 
+_service_additional_container_secrets: >-
+  {{
+    (
+      _service_additional_container.secrets
+        | map(attribute='name')
+        | map('community.general.dict_kv', 'target')
+        | zip(
+            _service_additional_container.secrets,
+            _service_additional_container.secrets
+              | map(attribute='name')
+              | map('regex_replace', '^', service_name ~ '-')
+              | map('community.general.dict_kv', 'name')
+          )
+        | map('combine')
+    ) if _service_additional_container.secrets is defined
+    else _service_container_secrets
+  }}
+
 _service_additional_container_ip: >-
   {{
     service_container_ip |