Replace role_name with service_name

playbooks/roles/acme_dns/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 acme_dns_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 80
   nsadmin: "{{ admin_email | regex_replace('@', '.') }}"
   records:

playbooks/roles/acme_dns/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/acme_dns/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ acme_dns_svc }}"
     env: "{{ acme_dns_env }}"
@@ -26,7 +26,7 @@
         src: config.cfg.j2
         dest: "{{ (acme_dns_config_path, 'config.cfg') | path_join }}"
         mode: "0600"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/authentik/defaults/main.yml

@@ -2,7 +2,7 @@
 authentik_secret_key: "{{ undef() }}"
 
 authentik_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 9000
   caddy_proxy_extra: "header_up X-Forwarded-Host {http.request.header.X-Forward-Auth-Host}"
   image_tag: 2025.2

playbooks/roles/authentik/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ authentik_svc }}"
     env: "{{ authentik_env }}"

playbooks/roles/backup/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   block:
     - name: Import prepare tasks for common service
       ansible.builtin.import_tasks: tasks/prepare-common-service.yml

playbooks/roles/caddy/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml
-- name: Rebuild service {{ role_name }}
+- name: Rebuild service {{ service_name }}
   ansible.builtin.include_tasks: tasks/rebuild-service.yml

playbooks/roles/caddy/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ caddy_env }}"
     compose: "{{ caddy_compose }}"
@@ -15,7 +15,7 @@
         src: Dockerfile
         dest: "{{ (service_path, 'Dockerfile') | path_join }}"
         mode: "0644"
-      notify: Rebuild service {{ role_name }}
+      notify: Rebuild service {{ service_name }}
 
     - name: Set caddy config path
       ansible.builtin.set_fact:

playbooks/roles/calibre_web/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 calibre_web_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8083
   caddy_proxy_extra: |
     header_up X-Scheme https

playbooks/roles/calibre_web/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/calibre_web/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ calibre_web_svc }}"
     env: "{{ calibre_web_env }}"

playbooks/roles/deploy/defaults/main.yml

@@ -2,7 +2,7 @@
 deploy_reitanlage_oranienburg_token: "{{ undef() }}"
 
 deploy_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 9000
 
 deploy_yml:

playbooks/roles/deploy/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ deploy_svc }}"
     compose: "{{ deploy_compose }}"

playbooks/roles/dmarc_report/defaults/main.yml

@@ -5,7 +5,7 @@ dmarc_report_imap_host: "{{ mailer.host }}"
 dmarc_report_imap_folder: Inbox
 
 dmarc_report_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8080
   caddy_extra: import vpn_only
 

playbooks/roles/dmarc_report/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/dmarc_report/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ dmarc_report_svc }}"
     env: "{{ dmarc_report_env }}"

playbooks/roles/dokku/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 dokku_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   additional_domains:
     - "*.paas.serguzim.me"
   caddy_extra: import acmedns

playbooks/roles/dokku/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ dokku_svc }}"
     env: "{{ dokku_env }}"

playbooks/roles/emgauwa/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/emgauwa/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ emgauwa_env }}"
     compose: "{{ emgauwa_compose }}"
@@ -15,21 +15,21 @@
         src: Caddyfile
         dest: "{{ (service_path, 'Caddyfile') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Create core config
       ansible.builtin.copy:
         dest: "{{ (service_path, 'emgauwa-core.yml') | path_join }}"
         content: '{{ emgauwa_core_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Create controller config
       ansible.builtin.copy:
         dest: "{{ (service_path, 'emgauwa-controller.yml') | path_join }}"
         content: '{{ emgauwa_controller_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/factorio/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ factorio_svc }}"
     env: "{{ factorio_env }}"

playbooks/roles/forgejo/defaults/main.yml

@@ -6,7 +6,7 @@ forgejo_oauth2_jwt_secret: "{{ undef() }}"
 forgejo_umami: "{{ undef() }}"
 
 forgejo_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 3000
   caddy_extra: |
     import analytics

playbooks/roles/forgejo/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/forgejo/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ forgejo_svc }}"
     compose: "{{ forgejo_compose }}"
@@ -15,28 +15,28 @@
         dest: "{{ (service_path, 'app.ini') | path_join }}"
         content: '{{ forgejo_ini | community.general.to_ini }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Copy the template files
       ansible.builtin.copy:
         src: templates/
         dest: "{{ (service_path, 'templates') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Template the custom footer
       ansible.builtin.template:
         src: footer.tmpl.j2
         dest: "{{ (service_path, 'templates', 'custom', 'footer.tmpl') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Copy the public files
       ansible.builtin.copy:
         src: public/
         dest: "{{ (service_path, 'public') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/forgejo_runner/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ forgejo_runner_env }}"
     compose: "{{ forgejo_runner_compose }}"

playbooks/roles/gatus/defaults/main.yml

@@ -33,7 +33,7 @@ gatus_endpoints_other:
 gatus_alerting: "{{ undef() }}"
 
 gatus_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8080
 
 gatus_yml:

playbooks/roles/gatus/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/gatus/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ gatus_svc }}"
     compose: "{{ gatus_compose }}"
@@ -15,7 +15,7 @@
         dest: "{{ (service_path, 'config.yaml') | path_join }}"
         content: '{{ gatus_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/healthcheck/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ healthcheck_svc }}"
     env: "{{ healthcheck_env }}"

playbooks/roles/homebox/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 homebox_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 7745
 
 homebox_env:

playbooks/roles/homebox/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ homebox_svc }}"
     env: "{{ homebox_env }}"

playbooks/roles/immich/defaults/main.yml

@@ -7,7 +7,7 @@ immich_db_pass: "{{ undef() }}"
 immich_docker_tag: v2.3.1
 
 immich_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 2283
 
 immich_env:

playbooks/roles/immich/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ immich_svc }}"
     env: "{{ immich_env }}"

playbooks/roles/immich_worker/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ immich_worker_env }}"
     compose: "{{ immich_worker_compose }}"

playbooks/roles/influxdb/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 influxdb_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8086
   data_dir: /var/lib/influxdb2
 

playbooks/roles/influxdb/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/influxdb/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ influxdb_svc }}"
     env: "{{ influxdb_env }}"
@@ -16,7 +16,7 @@
         dest: "{{ (service_path, 'influxdb.yml') | path_join }}"
         content: '{{ influxdb_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/jellyfin/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 jellyfin_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8096
   db:
     host: "{{ postgres.host }}"

playbooks/roles/jellyfin/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ jellyfin_svc }}"
     env: "{{ jellyfin_env }}"

playbooks/roles/jitsi/defaults/main.yml

@@ -4,7 +4,7 @@ jitsi_jicofo_auth_password: "{{ undef() }}"
 jitsi_jvb_auth_password: "{{ undef() }}"
 
 jitsi_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 80
 
 jitsi_env:

playbooks/roles/jitsi/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/jitsi/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ jitsi_svc }}"
     env: "{{ jitsi_env }}"

playbooks/roles/lego/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ lego_env }}"
     compose: "{{ lego_compose }}"

playbooks/roles/lgtm_stack/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-lgtm_stack_domain: "{{ all_services | service_get_domain(role_name) }}"
+lgtm_stack_domain: "{{ all_services | service_get_domain(service_name) }}"
 lgtm_stack_mimir_domain: mimir.serguzim.me
 lgtm_stack_alloy_domain: alloy.serguzim.me
 lgtm_stack_loki_domain: "{{ all_services | service_get_domain('loki') }}"

playbooks/roles/lgtm_stack/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/lgtm_stack/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ lgtm_stack_svc }}"
     env: "{{ lgtm_stack_env }}"
@@ -19,14 +19,14 @@
         src: config.alloy.j2
         dest: "{{ (service_path, 'config.alloy') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Create mimir config
       ansible.builtin.copy:
         dest: "{{ (service_path, 'mimir.yaml') | path_join }}"
         content: '{{ lgtm_stack_mimir_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/loki/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 loki_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 3100
   caddy_extra: import vpn_only
 

playbooks/roles/loki/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/loki/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ loki_svc }}"
     compose: "{{ loki_compose }}"
@@ -15,7 +15,7 @@
         dest: "{{ (service_path, 'loki.yaml') | path_join }}"
         content: '{{ loki_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/mailcowdockerized/defaults/main.yml

@@ -2,7 +2,7 @@
 mailcowdockerized_domains: "{{ undef }}"
 
 mailcowdockerized_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   docker_host: host.docker.internal
   port: 3004
   additional_domains: "{{ ['autodiscover', 'autoconfig'] | product(mailcowdockerized_domains | mandatory) | map('join', '.') }}"

playbooks/roles/mailcowdockerized/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ mailcowdockerized_svc }}"
   block:

playbooks/roles/minecraft_2/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ minecraft_2_env }}"
     compose: "{{ minecraft_2_compose }}"

playbooks/roles/minecraft_3/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ minecraft_3_env }}"
     compose: "{{ minecraft_3_compose }}"

playbooks/roles/minio/defaults/main.yml

@@ -3,7 +3,7 @@ minio_user: "{{ undef() }}"
 minio_pass: "{{ undef() }}"
 
 minio_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 9000
   caddy_extra: |
     @nocache {

playbooks/roles/minio/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ minio_svc }}"
     env: "{{ minio_env }}"

playbooks/roles/node_exporter/tasks/main.yml

@@ -1,4 +1,4 @@
 ---
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   ansible.builtin.import_role:
     name: prometheus.prometheus.node_exporter

playbooks/roles/ntfy/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 ntfy_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 80
 
 ntfy_env:

playbooks/roles/ntfy/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ ntfy_svc }}"
     compose: "{{ ntfy_compose }}"

playbooks/roles/paperless/defaults/main.yml

@@ -5,7 +5,7 @@ paperless_gid: 1000
 paperless_secret_key: "{{ undef() }}"
 
 paperless_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8000
 
 paperless_env:

playbooks/roles/paperless/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ paperless_svc }}"
     env: "{{ paperless_env }}"

playbooks/roles/phpvms/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/phpvms/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ phpvms_svc }}"
     env: "{{ phpvms_env }}"
@@ -32,7 +32,7 @@
         owner: "{{ phpvms_uid }}"
         group: "{{ phpvms_gid }}"
       become: true
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Copy Caddyfile
       ansible.builtin.copy:

playbooks/roles/reitanlage_oranienburg/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 reitanlage_oranienburg_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   www_domain: true
   port: 80
   caddy_extra: |

playbooks/roles/reitanlage_oranienburg/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ reitanlage_oranienburg_svc }}"
     compose: "{{ reitanlage_oranienburg_compose }}"

playbooks/roles/shlink/defaults/main.yml

@@ -2,7 +2,7 @@
 shlink_geolite_key: "{{ undef() }}"
 
 shlink_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   additional_domains:
     - "emgauwa.app"
   port: 8080

playbooks/roles/shlink/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ shlink_svc }}"
     env: "{{ shlink_env }}"

playbooks/roles/synapse/defaults/main.yml

@@ -4,7 +4,7 @@ synapse_form_secret: "{{ undef() }}"
 synapse_signing_key: "{{ undef() }}"
 
 synapse_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   docker_host: synapse-admin
   port: 80
   caddy_extra: |

playbooks/roles/synapse/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/synapse/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ synapse_svc }}"
     env: "{{ synapse_env }}"
@@ -26,21 +26,21 @@
         dest: "{{ (synapse_config_path, 'homeserver.yaml') | path_join }}"
         content: '{{ synapse_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Copy the log config
       ansible.builtin.copy:
         src: msrg.cc.log.config
         dest: "{{ (synapse_config_path, 'msrg.cc.log.config') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Copy the signing key
       ansible.builtin.copy:
         content: "{{ synapse_signing_key | mandatory }}"
         dest: "{{ (synapse_config_path, 'msrg.cc.signing.key') | path_join }}"
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/tandoor/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 tandoor_secret_key: "{{ undef() }}"
 tandoor_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 80
   db:
     host: "{{ postgres.host }}"

playbooks/roles/tandoor/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ tandoor_svc }}"
     env: "{{ tandoor_env }}"

playbooks/roles/teamspeak_fallback/defaults/main.yml

@@ -8,7 +8,7 @@ teamspeak_fallback_user: 9987
 teamspeak_fallback_group: 9987
 
 teamspeak_fallback_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 9000
 
 teamspeak_fallback_env:

playbooks/roles/teamspeak_fallback/handlers/main.yml

@@ -1,5 +1,5 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml
-- name: Rebuild service {{ role_name }}
+- name: Rebuild service {{ service_name }}
   ansible.builtin.include_tasks: tasks/rebuild-service.yml

playbooks/roles/teamspeak_fallback/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ teamspeak_fallback_svc }}"
     compose: "{{ teamspeak_fallback_compose }}"
@@ -16,7 +16,7 @@
         src: Dockerfile
         dest: "{{ (service_path, 'Dockerfile') | path_join }}"
         mode: "0644"
-      notify: Rebuild service {{ role_name }}
+      notify: Rebuild service {{ service_name }}
 
     - name: Template the conditional-start script
       ansible.builtin.template:
@@ -39,7 +39,7 @@
         dest: "{{ (teamspeak_fallback_config_path, 'hooks.yml') | path_join }}"
         content: '{{ teamspeak_fallback_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Copy the teamspeak-fallback-db script
       ansible.builtin.copy:

playbooks/roles/tinytinyrss/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 tinytinyrss_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 80
   db:
     host: "{{ postgres.host }}"

playbooks/roles/tinytinyrss/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ tinytinyrss_svc }}"
     env: "{{ tinytinyrss_env }}"

playbooks/roles/umami/defaults/main.yml

@@ -9,7 +9,7 @@ umami_hash_salt: "{{ undef() }}"
 umami_docker_image: docker.umami.dev/umami-software/umami:3
 
 umami_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   caddy_extra: |
     handle /track-external.js {
       header Content-Type text/javascript

playbooks/roles/umami/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ umami_svc }}"
     env: "{{ umami_env }}"

playbooks/roles/vikunja/defaults/main.yml

@@ -2,7 +2,7 @@
 vikunja_jwt_secret: "{{ undef() }}"
 
 vikunja_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 3456
   db:
     host: "{{ postgres.host }}"

playbooks/roles/vikunja/handlers/main.yml

@@ -1,3 +1,3 @@
 ---
-- name: Restart service {{ role_name }}
+- name: Restart service {{ service_name }}
   ansible.builtin.include_tasks: tasks/restart-service.yml

playbooks/roles/vikunja/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ vikunja_svc }}"
     compose: "{{ vikunja_compose }}"
@@ -15,7 +15,7 @@
         dest: "{{ (service_path, 'config.yml') | path_join }}"
         content: '{{ vikunja_yml | to_nice_yaml }}'
         mode: "0644"
-      notify: Restart service {{ role_name }}
+      notify: Restart service {{ service_name }}
 
     - name: Import start tasks for common service
       ansible.builtin.import_tasks: tasks/start-common-service.yml

playbooks/roles/watchtower/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     env: "{{ watchtower_env }}"
     compose: "{{ watchtower_compose }}"

playbooks/roles/webdis/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 webdis_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 7379
 
 webdis_compose:

playbooks/roles/webdis/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ webdis_svc }}"
     compose: "{{ webdis_compose }}"

playbooks/roles/wiki_js/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 wiki_js_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 3000
   caddy_extra: |
     import analytics

playbooks/roles/wiki_js/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ wiki_js_svc }}"
     env: "{{ wiki_js_env }}"

playbooks/roles/woodpecker/defaults/main.yml

@@ -4,7 +4,7 @@ woodpecker_gitea_client: "{{ undef() }}"
 woodpecker_gitea_secret: "{{ undef() }}"
 
 woodpecker_svc:
-  domain: "{{ all_services | service_get_domain(role_name) }}"
+  domain: "{{ all_services | service_get_domain(service_name) }}"
   port: 8000
   extra_svcs:
     - domain: agents.ci.serguzim.me

playbooks/roles/woodpecker/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Set common facts
   ansible.builtin.import_tasks: tasks/set-default-facts.yml
 
-- name: Deploy {{ role_name }}
+- name: Deploy {{ service_name }}
   vars:
     svc: "{{ woodpecker_svc }}"
     env: "{{ woodpecker_env }}"