Remove explicit svc.name

This commit is contained in:
Tobias Reisinger 2024-10-13 21:48:04 +02:00
commit dbb3075c82
Signed by: serguzim
GPG key ID: 13AD60C237A28DFE
67 changed files with 36 additions and 87 deletions

View file

@ -19,7 +19,7 @@ compose_file_networks:
default:
apps:
aliases:
- "{{ svc.name }}"
- "{{ role_name }}"
networks:
default:
apps:

View file

@ -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 %}

View file

@ -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 }}"

View file

@ -1,7 +1,6 @@
---
NAME_svc:
domain: NAME.serguzim.me
name: NAME
port: 80
NAME_env:

View file

@ -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 }}"

View file

@ -1,7 +1,6 @@
---
acme_dns_svc:
domain: "{{ acme_dns.host }}"
name: acme-dns
port: 80
nsadmin: "{{ admin_email | regex_replace('@', '.') }}"
records:

View file

@ -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 }}"

View file

@ -1,7 +1,6 @@
---
authentik_svc:
domain: auth.serguzim.me
name: authentik
port: 9000
image_tag: 2024.8
db:

View file

@ -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:

View file

@ -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') }}"

View file

@ -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:

View file

@ -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

View file

@ -1,4 +1,3 @@
---
extra_services_svc:
name: extra_services
extra_svcs: "{{ vault_extra_services }}"

View file

@ -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:

View file

@ -1,6 +1,5 @@
---
faas_svc:
name: faas
domain: faas.serguzim.me
docker_host: host.docker.internal
port: 8080

View file

@ -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 }}"

View file

@ -1,7 +1,6 @@
---
forgejo_svc:
domain: git.serguzim.me
name: forgejo
port: 3000
caddy_extra: |
import analytics

View file

@ -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:

View file

@ -1,7 +1,4 @@
---
forgejo_runner_svc:
name: forgejo-runner
forgejo_runner_env:
FORGEJO_INSTANCE_URL: https://git.serguzim.me/
FORGEJO_RUNNER_REGISTRATION_TOKEN:

View file

@ -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 }}"

Some files were not shown because too many files have changed in this diff Show more