Remove special handling of common services and refactor getting service attributes

playbooks/roles/backup/vars/main.yml

@@ -1,6 +1,6 @@
 ---
-backup_list: "{{ all_services | my_service_attributes(inventory_hostname, 'backup') }}"
-backup_list_all: "{{ all_services | my_service_attributes('', 'backup') }}"
+backup_list: "{{ host_services | map(attribute='backup') | flatten }}"
+backup_list_all: "{{ all_services | map(attribute='backup') | flatten }}"
 
 backup_msg_start: "Backup started"
 backup_msg_fail: "Backup failed"

playbooks/roles/caddy/vars/main.yml

@@ -5,11 +5,8 @@ caddy_acmedns_subd: "{{ vault_caddy.acmedns.subd }}"
 caddy_acmedns_url: "https://{{ acme_dns.host }}"
 
 caddy_ports_default:
-  - 80:80
-  - 443:443
-  - 443:443/udp
   - "{{ host_vpn.ip }}:2019:2019"
-caddy_ports_extra: "{{ all_services | my_service_attributes(inventory_hostname, 'ports') }}"
+caddy_ports_extra: "{{ host_services | map(attribute='ports') | flatten }}"
 caddy_ports: "{{ caddy_ports_default | union(caddy_ports_extra) }}"
 
 caddy_env:

playbooks/roles/lego/vars/main.yml

@@ -1,5 +1,5 @@
 ---
-lego_host_certificates: "{{ all_services | my_service_attributes(inventory_hostname, 'certificates') }}"
+lego_host_certificates: "{{ host_services | map(attribute='certificates') | flatten }}"
 
 lego_env:
   ACME_DNS_API_BASE: https://{{ acme_dns.host }}