From dbb3075c8273b1e5ca3ef60c807b0f29435374b3 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Sun, 13 Oct 2024 21:48:04 +0200 Subject: [PATCH] Remove explicit svc.name --- inventory/group_vars/all/compose_defaults.yml | 2 +- playbooks/templates/caddy_site.conf.j2 | 2 +- roles/_TEMPLATE/tasks/main.yml | 2 +- roles/_TEMPLATE/vars/main.yml | 1 - roles/acme_dns/tasks/main.yml | 2 +- roles/acme_dns/vars/main.yml | 1 - roles/authentik/tasks/main.yml | 2 +- roles/authentik/vars/main.yml | 1 - roles/backup/tasks/main.yml | 2 +- roles/backup/vars/main.yml | 4 ---- roles/caddy/tasks/main.yml | 3 +-- roles/caddy/vars/main.yml | 3 --- roles/extra_services/vars/main.yml | 1 - roles/faas/tasks/main.yml | 2 +- roles/faas/vars/main.yml | 1 - roles/forgejo/tasks/main.yml | 2 +- roles/forgejo/vars/main.yml | 1 - roles/forgejo_runner/tasks/main.yml | 3 +-- roles/forgejo_runner/vars/main.yml | 3 --- roles/gatus/tasks/main.yml | 2 +- roles/gatus/vars/main.yml | 1 - roles/healthcheck/tasks/main.yml | 2 +- roles/healthcheck/vars/main.yml | 1 - roles/homebox/tasks/main.yml | 2 +- roles/homebox/vars/main.yml | 1 - roles/immich/tasks/main.yml | 2 +- roles/immich/vars/main.yml | 1 - roles/influxdb/tasks/main.yml | 2 +- roles/influxdb/vars/main.yml | 1 - roles/jellyfin/tasks/main.yml | 2 +- roles/jellyfin/vars/main.yml | 1 - roles/lego/tasks/main.yml | 3 +-- roles/lego/vars/main.yml | 3 --- roles/linkwarden/tasks/main.yml | 2 +- roles/linkwarden/vars/main.yml | 1 - roles/mailcowdockerized/tasks/main.yml | 2 +- roles/mailcowdockerized/vars/main.yml | 1 - roles/minecraft_2/tasks/main.yml | 3 +-- roles/minecraft_2/vars/main.yml | 3 --- roles/minio/tasks/main.yml | 2 +- roles/minio/vars/main.yml | 1 - roles/ntfy/tasks/main.yml | 2 +- roles/ntfy/vars/main.yml | 1 - roles/reitanlage_oranienburg/tasks/main.yml | 2 +- roles/reitanlage_oranienburg/vars/main.yml | 1 - roles/shlink/tasks/main.yml | 2 +- roles/shlink/vars/main.yml | 1 - roles/synapse/tasks/main.yml | 2 +- roles/synapse/vars/main.yml | 1 - roles/tandoor/tasks/main.yml | 2 +- roles/tandoor/vars/main.yml | 1 - roles/teamspeak_fallback/tasks/main.yml | 2 +- roles/teamspeak_fallback/vars/main.yml | 1 - roles/telegraf/tasks/main.yml | 2 +- roles/telegraf/vars/main.yml | 1 - roles/tinytinyrss/tasks/main.yml | 2 +- roles/tinytinyrss/vars/main.yml | 1 - roles/umami/tasks/main.yml | 2 +- roles/umami/vars/main.yml | 1 - roles/vikunja/tasks/main.yml | 2 +- roles/vikunja/vars/main.yml | 1 - roles/watchtower/tasks/main.yml | 3 +-- roles/watchtower/vars/main.yml | 7 ++----- roles/wiki_js/tasks/main.yml | 2 +- roles/wiki_js/vars/main.yml | 1 - roles/woodpecker/tasks/main.yml | 2 +- roles/woodpecker/vars/main.yml | 1 - 67 files changed, 36 insertions(+), 87 deletions(-) diff --git a/inventory/group_vars/all/compose_defaults.yml b/inventory/group_vars/all/compose_defaults.yml index 4be859e..0094c6e 100644 --- a/inventory/group_vars/all/compose_defaults.yml +++ b/inventory/group_vars/all/compose_defaults.yml @@ -19,7 +19,7 @@ compose_file_networks: default: apps: aliases: - - "{{ svc.name }}" + - "{{ role_name }}" networks: default: apps: diff --git a/playbooks/templates/caddy_site.conf.j2 b/playbooks/templates/caddy_site.conf.j2 index 9a8ef9b..0ed1ac0 100644 --- a/playbooks/templates/caddy_site.conf.j2 +++ b/playbooks/templates/caddy_site.conf.j2 @@ -21,7 +21,7 @@ {% elif svc.redirect|default(false) %} redir "{{ svc.redirect }}" {% else %} - reverse_proxy {{ svc.docker_host|default(svc.name) }}:{{ svc.port }} + reverse_proxy {{ svc.docker_host|default(role_name) }}:{{ svc.port }} {% endif %} } {% endif %} diff --git a/roles/_TEMPLATE/tasks/main.yml b/roles/_TEMPLATE/tasks/main.yml index 53f2d27..0653450 100644 --- a/roles/_TEMPLATE/tasks/main.yml +++ b/roles/_TEMPLATE/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ NAME_svc }}" env: "{{ NAME_env }}" diff --git a/roles/_TEMPLATE/vars/main.yml b/roles/_TEMPLATE/vars/main.yml index a1db2a8..0bff880 100644 --- a/roles/_TEMPLATE/vars/main.yml +++ b/roles/_TEMPLATE/vars/main.yml @@ -1,7 +1,6 @@ --- NAME_svc: domain: NAME.serguzim.me - name: NAME port: 80 NAME_env: diff --git a/roles/acme_dns/tasks/main.yml b/roles/acme_dns/tasks/main.yml index 9eed97f..64fd64e 100644 --- a/roles/acme_dns/tasks/main.yml +++ b/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 {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ acme_dns_svc }}" env: "{{ acme_dns_env }}" diff --git a/roles/acme_dns/vars/main.yml b/roles/acme_dns/vars/main.yml index 616c1e2..54492e5 100644 --- a/roles/acme_dns/vars/main.yml +++ b/roles/acme_dns/vars/main.yml @@ -1,7 +1,6 @@ --- acme_dns_svc: domain: "{{ acme_dns.host }}" - name: acme-dns port: 80 nsadmin: "{{ admin_email | regex_replace('@', '.') }}" records: diff --git a/roles/authentik/tasks/main.yml b/roles/authentik/tasks/main.yml index 05c7ec4..dac306e 100644 --- a/roles/authentik/tasks/main.yml +++ b/roles/authentik/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ authentik_svc }}" env: "{{ authentik_env }}" diff --git a/roles/authentik/vars/main.yml b/roles/authentik/vars/main.yml index f0e9877..8ff6788 100644 --- a/roles/authentik/vars/main.yml +++ b/roles/authentik/vars/main.yml @@ -1,7 +1,6 @@ --- authentik_svc: domain: auth.serguzim.me - name: authentik port: 9000 image_tag: 2024.8 db: diff --git a/roles/backup/tasks/main.yml b/roles/backup/tasks/main.yml index ea7880d..f07ed74 100644 --- a/roles/backup/tasks/main.yml +++ b/roles/backup/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: yml: "{{ backup_yml }}" block: diff --git a/roles/backup/vars/main.yml b/roles/backup/vars/main.yml index f15dfb4..60a4d76 100644 --- a/roles/backup/vars/main.yml +++ b/roles/backup/vars/main.yml @@ -1,8 +1,4 @@ --- - -backup_svc: - name: backup - backup_list: "{{ all_services | my_service_attributes(inventory_hostname, 'backup') }}" backup_list_all: "{{ all_services | my_service_attributes('', 'backup') }}" diff --git a/roles/caddy/tasks/main.yml b/roles/caddy/tasks/main.yml index bd9a6b5..8a0eb86 100644 --- a/roles/caddy/tasks/main.yml +++ b/roles/caddy/tasks/main.yml @@ -2,9 +2,8 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: - svc: "{{ caddy_svc }}" env: "{{ caddy_env }}" compose: "{{ caddy_compose }}" block: diff --git a/roles/caddy/vars/main.yml b/roles/caddy/vars/main.yml index 7724dca..d537d1d 100644 --- a/roles/caddy/vars/main.yml +++ b/roles/caddy/vars/main.yml @@ -12,9 +12,6 @@ caddy_ports_default: caddy_ports_extra: "{{ all_services | my_service_attributes(inventory_hostname, 'ports') }}" caddy_ports: "{{ caddy_ports_default | union(caddy_ports_extra) }}" -caddy_svc: - name: caddy - caddy_env: CADDY_ADMIN: 0.0.0.0:2019 diff --git a/roles/extra_services/vars/main.yml b/roles/extra_services/vars/main.yml index 72f238c..89992be 100644 --- a/roles/extra_services/vars/main.yml +++ b/roles/extra_services/vars/main.yml @@ -1,4 +1,3 @@ --- extra_services_svc: - name: extra_services extra_svcs: "{{ vault_extra_services }}" diff --git a/roles/faas/tasks/main.yml b/roles/faas/tasks/main.yml index f2d6b02..85e7c33 100644 --- a/roles/faas/tasks/main.yml +++ b/roles/faas/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ faas_svc }}" block: diff --git a/roles/faas/vars/main.yml b/roles/faas/vars/main.yml index 69d7ca8..1b1b446 100644 --- a/roles/faas/vars/main.yml +++ b/roles/faas/vars/main.yml @@ -1,6 +1,5 @@ --- faas_svc: - name: faas domain: faas.serguzim.me docker_host: host.docker.internal port: 8080 diff --git a/roles/forgejo/tasks/main.yml b/roles/forgejo/tasks/main.yml index bebe90e..c154ff0 100644 --- a/roles/forgejo/tasks/main.yml +++ b/roles/forgejo/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ forgejo_svc }}" env: "{{ forgejo_env }}" diff --git a/roles/forgejo/vars/main.yml b/roles/forgejo/vars/main.yml index 155e06a..97b3510 100644 --- a/roles/forgejo/vars/main.yml +++ b/roles/forgejo/vars/main.yml @@ -1,7 +1,6 @@ --- forgejo_svc: domain: git.serguzim.me - name: forgejo port: 3000 caddy_extra: | import analytics diff --git a/roles/forgejo_runner/tasks/main.yml b/roles/forgejo_runner/tasks/main.yml index 911dfd1..23baa58 100644 --- a/roles/forgejo_runner/tasks/main.yml +++ b/roles/forgejo_runner/tasks/main.yml @@ -2,9 +2,8 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: - svc: "{{ forgejo_runner_svc }}" env: "{{ forgejo_runner_env }}" compose: "{{ forgejo_runner_compose }}" block: diff --git a/roles/forgejo_runner/vars/main.yml b/roles/forgejo_runner/vars/main.yml index 2b13fbf..38a1937 100644 --- a/roles/forgejo_runner/vars/main.yml +++ b/roles/forgejo_runner/vars/main.yml @@ -1,7 +1,4 @@ --- -forgejo_runner_svc: - name: forgejo-runner - forgejo_runner_env: FORGEJO_INSTANCE_URL: https://git.serguzim.me/ FORGEJO_RUNNER_REGISTRATION_TOKEN: diff --git a/roles/gatus/tasks/main.yml b/roles/gatus/tasks/main.yml index 44d25ee..2b47fe2 100644 --- a/roles/gatus/tasks/main.yml +++ b/roles/gatus/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ gatus_svc }}" yml: "{{ gatus_yml }}" diff --git a/roles/gatus/vars/main.yml b/roles/gatus/vars/main.yml index f425c00..447a356 100644 --- a/roles/gatus/vars/main.yml +++ b/roles/gatus/vars/main.yml @@ -1,7 +1,6 @@ --- gatus_svc: domain: status.serguzim.me - name: gatus port: 8080 gatus_external_endpoints_backups: "{{ vault_hosts | vault_hosts_backup_to_gatus() }}" diff --git a/roles/healthcheck/tasks/main.yml b/roles/healthcheck/tasks/main.yml index 9a04158..a859b97 100644 --- a/roles/healthcheck/tasks/main.yml +++ b/roles/healthcheck/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ healthcheck_svc }}" env: "{{ healthcheck_env }}" diff --git a/roles/healthcheck/vars/main.yml b/roles/healthcheck/vars/main.yml index 499cbb0..092d66e 100644 --- a/roles/healthcheck/vars/main.yml +++ b/roles/healthcheck/vars/main.yml @@ -1,6 +1,5 @@ --- healthcheck_svc: - name: healthcheck checks: - mail - matrix diff --git a/roles/homebox/tasks/main.yml b/roles/homebox/tasks/main.yml index d4aed71..6d3cd88 100644 --- a/roles/homebox/tasks/main.yml +++ b/roles/homebox/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ homebox_svc }}" env: "{{ homebox_env }}" diff --git a/roles/homebox/vars/main.yml b/roles/homebox/vars/main.yml index 0376954..0f9ba96 100644 --- a/roles/homebox/vars/main.yml +++ b/roles/homebox/vars/main.yml @@ -1,7 +1,6 @@ --- homebox_svc: domain: inventory.serguzim.me - name: homebox port: 7745 homebox_env: diff --git a/roles/immich/tasks/main.yml b/roles/immich/tasks/main.yml index 78fd542..44297e8 100644 --- a/roles/immich/tasks/main.yml +++ b/roles/immich/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ immich_svc }}" env: "{{ immich_env }}" diff --git a/roles/immich/vars/main.yml b/roles/immich/vars/main.yml index 0f4f92f..c197b70 100644 --- a/roles/immich/vars/main.yml +++ b/roles/immich/vars/main.yml @@ -6,7 +6,6 @@ immich_db_pass: "{{ vault_immich.db.pass }}" immich_svc: domain: gallery.serguzim.me - name: immich port: 3001 version: release db: diff --git a/roles/influxdb/tasks/main.yml b/roles/influxdb/tasks/main.yml index dfb6043..487ec1b 100644 --- a/roles/influxdb/tasks/main.yml +++ b/roles/influxdb/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ influxdb_svc }}" env: "{{ influxdb_env }}" diff --git a/roles/influxdb/vars/main.yml b/roles/influxdb/vars/main.yml index 1517777..5d8217f 100644 --- a/roles/influxdb/vars/main.yml +++ b/roles/influxdb/vars/main.yml @@ -1,7 +1,6 @@ --- influxdb_svc: domain: tick.serguzim.me - name: influxdb port: 8086 data_dir: /var/lib/influxdb2 diff --git a/roles/jellyfin/tasks/main.yml b/roles/jellyfin/tasks/main.yml index 112567d..bde290d 100644 --- a/roles/jellyfin/tasks/main.yml +++ b/roles/jellyfin/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ jellyfin_svc }}" env: "{{ jellyfin_env }}" diff --git a/roles/jellyfin/vars/main.yml b/roles/jellyfin/vars/main.yml index 17db44a..321fedb 100644 --- a/roles/jellyfin/vars/main.yml +++ b/roles/jellyfin/vars/main.yml @@ -1,7 +1,6 @@ --- jellyfin_svc: domain: media.serguzim.me - name: jellyfin port: 8096 db: host: "{{ postgres.host }}" diff --git a/roles/lego/tasks/main.yml b/roles/lego/tasks/main.yml index 6bdbb49..2360fa9 100644 --- a/roles/lego/tasks/main.yml +++ b/roles/lego/tasks/main.yml @@ -2,9 +2,8 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: - svc: "{{ lego_svc }}" env: "{{ lego_env }}" json: "{{ vault_acmedns_registered | acmedns_to_lego }}" compose: "{{ lego_compose }}" diff --git a/roles/lego/vars/main.yml b/roles/lego/vars/main.yml index 3b4b26e..ce128d5 100644 --- a/roles/lego/vars/main.yml +++ b/roles/lego/vars/main.yml @@ -1,9 +1,6 @@ --- lego_host_certificates: "{{ all_services | my_service_attributes(inventory_hostname, 'certificates') }}" -lego_svc: - name: lego - lego_env: ACME_DNS_API_BASE: https://{{ acme_dns.host }} ACME_DNS_STORAGE_PATH: /config/acme-dns-accounts.json diff --git a/roles/linkwarden/tasks/main.yml b/roles/linkwarden/tasks/main.yml index 4b06747..8a4ed11 100644 --- a/roles/linkwarden/tasks/main.yml +++ b/roles/linkwarden/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ linkwarden_svc }}" env: "{{ linkwarden_env }}" diff --git a/roles/linkwarden/vars/main.yml b/roles/linkwarden/vars/main.yml index 8df1e66..cd0b26a 100644 --- a/roles/linkwarden/vars/main.yml +++ b/roles/linkwarden/vars/main.yml @@ -11,7 +11,6 @@ linkwarden_s3_secretkey: "{{ opentofu.scaleway_data.linkwarden.secret_key }}" linkwarden_svc: domain: bookmarks.serguzim.me - name: linkwarden port: 3000 linkwarden_env: diff --git a/roles/mailcowdockerized/tasks/main.yml b/roles/mailcowdockerized/tasks/main.yml index 0be5884..ae0fea9 100644 --- a/roles/mailcowdockerized/tasks/main.yml +++ b/roles/mailcowdockerized/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ mailcowdockerized_svc }}" block: diff --git a/roles/mailcowdockerized/vars/main.yml b/roles/mailcowdockerized/vars/main.yml index f4b6d22..a87735f 100644 --- a/roles/mailcowdockerized/vars/main.yml +++ b/roles/mailcowdockerized/vars/main.yml @@ -1,6 +1,5 @@ --- mailcowdockerized_svc: - name: mailcowdockerized domain: mail.serguzim.me docker_host: host.docker.internal port: 3004 diff --git a/roles/minecraft_2/tasks/main.yml b/roles/minecraft_2/tasks/main.yml index fd5279c..c783efd 100644 --- a/roles/minecraft_2/tasks/main.yml +++ b/roles/minecraft_2/tasks/main.yml @@ -2,9 +2,8 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: - svc: "{{ minecraft_2_svc }}" env: "{{ minecraft_2_env }}" compose: "{{ minecraft_2_compose }}" block: diff --git a/roles/minecraft_2/vars/main.yml b/roles/minecraft_2/vars/main.yml index e14e7a1..cd9526c 100644 --- a/roles/minecraft_2/vars/main.yml +++ b/roles/minecraft_2/vars/main.yml @@ -1,7 +1,4 @@ --- -minecraft_2_svc: - name: minecraft-2 - minecraft_2_env: ALLOW_FLIGHT: true ALLOW_NETHER: true diff --git a/roles/minio/tasks/main.yml b/roles/minio/tasks/main.yml index 17d9abb..19be6a0 100644 --- a/roles/minio/tasks/main.yml +++ b/roles/minio/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ minio_svc }}" env: "{{ minio_env }}" diff --git a/roles/minio/vars/main.yml b/roles/minio/vars/main.yml index 3ca1172..07d51f0 100644 --- a/roles/minio/vars/main.yml +++ b/roles/minio/vars/main.yml @@ -1,7 +1,6 @@ --- minio_svc: domain: s3.serguzim.me - name: minio port: 9000 caddy_extra: | @nocache { diff --git a/roles/ntfy/tasks/main.yml b/roles/ntfy/tasks/main.yml index 4026612..e80fe8c 100644 --- a/roles/ntfy/tasks/main.yml +++ b/roles/ntfy/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ ntfy_svc }}" compose: "{{ ntfy_compose }}" diff --git a/roles/ntfy/vars/main.yml b/roles/ntfy/vars/main.yml index b881fe4..17f9558 100644 --- a/roles/ntfy/vars/main.yml +++ b/roles/ntfy/vars/main.yml @@ -1,6 +1,5 @@ --- ntfy_svc: - name: ntfy domain: push.serguzim.me port: 80 diff --git a/roles/reitanlage_oranienburg/tasks/main.yml b/roles/reitanlage_oranienburg/tasks/main.yml index a41843c..ba38e99 100644 --- a/roles/reitanlage_oranienburg/tasks/main.yml +++ b/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 {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ reitanlage_oranienburg_svc }}" compose: "{{ reitanlage_oranienburg_compose }}" diff --git a/roles/reitanlage_oranienburg/vars/main.yml b/roles/reitanlage_oranienburg/vars/main.yml index 976574b..8273a8f 100644 --- a/roles/reitanlage_oranienburg/vars/main.yml +++ b/roles/reitanlage_oranienburg/vars/main.yml @@ -1,6 +1,5 @@ --- reitanlage_oranienburg_svc: - name: reitanlage-oranienburg domain: reitanlage-oranienburg.de www_domain: true port: 80 diff --git a/roles/shlink/tasks/main.yml b/roles/shlink/tasks/main.yml index bc0230e..807248d 100644 --- a/roles/shlink/tasks/main.yml +++ b/roles/shlink/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ shlink_svc }}" env: "{{ shlink_env }}" diff --git a/roles/shlink/vars/main.yml b/roles/shlink/vars/main.yml index 0ba249d..4c7c6d4 100644 --- a/roles/shlink/vars/main.yml +++ b/roles/shlink/vars/main.yml @@ -3,7 +3,6 @@ shlink_svc: domain: msrg.cc additional_domains: - "emgauwa.app" - name: shlink port: 8080 shlink_env: diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml index ff17bed..38d0407 100644 --- a/roles/synapse/tasks/main.yml +++ b/roles/synapse/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ synapse_svc }}" env: "{{ synapse_env }}" diff --git a/roles/synapse/vars/main.yml b/roles/synapse/vars/main.yml index a0dfdb1..1dc9035 100644 --- a/roles/synapse/vars/main.yml +++ b/roles/synapse/vars/main.yml @@ -1,6 +1,5 @@ --- synapse_svc: - name: synapse domain: matrix.serguzim.me docker_host: synapse-admin port: 80 diff --git a/roles/tandoor/tasks/main.yml b/roles/tandoor/tasks/main.yml index 2c9b7fd..8e887d8 100644 --- a/roles/tandoor/tasks/main.yml +++ b/roles/tandoor/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ tandoor_svc }}" env: "{{ tandoor_env }}" diff --git a/roles/tandoor/vars/main.yml b/roles/tandoor/vars/main.yml index 939e385..a9a5a11 100644 --- a/roles/tandoor/vars/main.yml +++ b/roles/tandoor/vars/main.yml @@ -1,7 +1,6 @@ --- tandoor_svc: domain: recipes.serguzim.me - name: tandoor port: 80 db: host: "{{ postgres.host }}" diff --git a/roles/teamspeak_fallback/tasks/main.yml b/roles/teamspeak_fallback/tasks/main.yml index e2c70af..84b1823 100644 --- a/roles/teamspeak_fallback/tasks/main.yml +++ b/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 {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ teamspeak_fallback_svc }}" compose: "{{ teamspeak_fallback_compose }}" diff --git a/roles/teamspeak_fallback/vars/main.yml b/roles/teamspeak_fallback/vars/main.yml index 3a30806..121f2ef 100644 --- a/roles/teamspeak_fallback/vars/main.yml +++ b/roles/teamspeak_fallback/vars/main.yml @@ -8,7 +8,6 @@ teamspeak_fallback_user: 9987 teamspeak_fallback_group: 9987 teamspeak_fallback_svc: - name: teamspeak-fallback domain: ts.serguzim.me additional_domains: - hook.serguzim.me diff --git a/roles/telegraf/tasks/main.yml b/roles/telegraf/tasks/main.yml index 7db7dc4..3869e0f 100644 --- a/roles/telegraf/tasks/main.yml +++ b/roles/telegraf/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ telegraf_svc }}" env: "{{ telegraf_env }}" diff --git a/roles/telegraf/vars/main.yml b/roles/telegraf/vars/main.yml index 178938d..5210f29 100644 --- a/roles/telegraf/vars/main.yml +++ b/roles/telegraf/vars/main.yml @@ -1,6 +1,5 @@ --- telegraf_svc: - name: telegraf influxdb: url: https://tick.serguzim.me token: "{{ vault_telegraf.influxdb_token }}" diff --git a/roles/tinytinyrss/tasks/main.yml b/roles/tinytinyrss/tasks/main.yml index be3db8a..c5d57e9 100644 --- a/roles/tinytinyrss/tasks/main.yml +++ b/roles/tinytinyrss/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ tinytinyrss_svc }}" env: "{{ tinytinyrss_env }}" diff --git a/roles/tinytinyrss/vars/main.yml b/roles/tinytinyrss/vars/main.yml index 5ef2067..7a5dd1f 100644 --- a/roles/tinytinyrss/vars/main.yml +++ b/roles/tinytinyrss/vars/main.yml @@ -1,7 +1,6 @@ --- tinytinyrss_svc: domain: rss.serguzim.me - name: tinytinyrss port: 80 db: host: "{{ postgres.host }}" diff --git a/roles/umami/tasks/main.yml b/roles/umami/tasks/main.yml index ede7369..5cca711 100644 --- a/roles/umami/tasks/main.yml +++ b/roles/umami/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ umami_svc }}" env: "{{ umami_env }}" diff --git a/roles/umami/vars/main.yml b/roles/umami/vars/main.yml index 91f4c1a..dbe1849 100644 --- a/roles/umami/vars/main.yml +++ b/roles/umami/vars/main.yml @@ -10,7 +10,6 @@ umami_docker_image: docker.umami.dev/umami-software/umami:postgresql-latest umami_svc: domain: analytics.serguzim.me - name: umami port: 3000 umami_env: diff --git a/roles/vikunja/tasks/main.yml b/roles/vikunja/tasks/main.yml index 98b2035..74ab7ad 100644 --- a/roles/vikunja/tasks/main.yml +++ b/roles/vikunja/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ vikunja_svc }}" yml: "{{ vikunja_yml }}" diff --git a/roles/vikunja/vars/main.yml b/roles/vikunja/vars/main.yml index db2bc27..e5c3c2c 100644 --- a/roles/vikunja/vars/main.yml +++ b/roles/vikunja/vars/main.yml @@ -1,7 +1,6 @@ --- vikunja_svc: domain: todo.serguzim.me - name: vikunja port: 3456 db: host: "{{ postgres.host }}" diff --git a/roles/watchtower/tasks/main.yml b/roles/watchtower/tasks/main.yml index 90df08b..edad51c 100644 --- a/roles/watchtower/tasks/main.yml +++ b/roles/watchtower/tasks/main.yml @@ -2,9 +2,8 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: - svc: "{{ watchtower_svc }}" env: "{{ watchtower_env }}" compose: "{{ watchtower_compose }}" block: diff --git a/roles/watchtower/vars/main.yml b/roles/watchtower/vars/main.yml index 94aa577..78f4900 100644 --- a/roles/watchtower/vars/main.yml +++ b/roles/watchtower/vars/main.yml @@ -1,7 +1,4 @@ --- -watchtower_svc: - name: watchtower - watchtower_env: WATCHTOWER_LABEL_ENABLE: true WATCHTOWER_CLEANUP: true @@ -11,11 +8,11 @@ watchtower_env: # WATCHTOWER_NO_PULL: true WATCHTOWER_NOTIFICATIONS: email - WATCHTOWER_NOTIFICATION_EMAIL_FROM: "{{ svc.name }}@serguzim.me" + WATCHTOWER_NOTIFICATION_EMAIL_FROM: "watchtower@serguzim.me" WATCHTOWER_NOTIFICATION_EMAIL_TO: "{{ admin_email }}" WATCHTOWER_NOTIFICATION_EMAIL_SERVER: "{{ mailer.host }}" WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT: "{{ mailer.port }}" - WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER: "{{ svc.name }}@serguzim.me" + WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER: "watchtower@serguzim.me" WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD: "{{ vault_watchtower.mailer.pass }}" WATCHTOWER_NOTIFICATION_EMAIL_DELAY: 5 diff --git a/roles/wiki_js/tasks/main.yml b/roles/wiki_js/tasks/main.yml index a2b70d8..c57cedc 100644 --- a/roles/wiki_js/tasks/main.yml +++ b/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 {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ wiki_js_svc }}" env: "{{ wiki_js_env }}" diff --git a/roles/wiki_js/vars/main.yml b/roles/wiki_js/vars/main.yml index d0e968d..baa7863 100644 --- a/roles/wiki_js/vars/main.yml +++ b/roles/wiki_js/vars/main.yml @@ -1,7 +1,6 @@ --- wiki_js_svc: domain: wiki.serguzim.me - name: wiki-js port: 3000 caddy_extra: | import analytics diff --git a/roles/woodpecker/tasks/main.yml b/roles/woodpecker/tasks/main.yml index dc6a26d..8b466d3 100644 --- a/roles/woodpecker/tasks/main.yml +++ b/roles/woodpecker/tasks/main.yml @@ -2,7 +2,7 @@ - name: Set common facts ansible.builtin.import_tasks: tasks/set-default-facts.yml -- name: Deploy {{ svc.name }} +- name: Deploy {{ role_name }} vars: svc: "{{ woodpecker_svc }}" env: "{{ woodpecker_env }}" diff --git a/roles/woodpecker/vars/main.yml b/roles/woodpecker/vars/main.yml index 694fd4b..ce50125 100644 --- a/roles/woodpecker/vars/main.yml +++ b/roles/woodpecker/vars/main.yml @@ -1,7 +1,6 @@ --- woodpecker_svc: domain: ci.serguzim.me - name: woodpecker port: 8000 extra_svcs: - domain: agents.ci.serguzim.me