From b210abc77e76b5773e73c411fb50cbd8f86a0858 Mon Sep 17 00:00:00 2001 From: Mark Janssen -- Sig-I/O Automatisering Date: Thu, 11 Jul 2024 21:12:19 +0200 Subject: [PATCH] More rework --- bank.yaml | 1 + bar.yaml | 1 + common.yaml | 1 + fotos.yaml | 1 + git-ci.yaml | 1 + git.yaml | 1 + hosts.yaml => inventory | 0 monitoring.yaml | 1 + mqtt-internal.yaml | 1 + music.yaml | 1 + pad.yaml | 1 + roles/common-bitlair/tasks/main.yaml | 2 +- roles/common/tasks/main.yaml | 8 ++++++-- services.yaml | 1 + www.yaml | 1 + 15 files changed, 19 insertions(+), 3 deletions(-) rename hosts.yaml => inventory (100%) diff --git a/bank.yaml b/bank.yaml index e3f5930..dd84606 100644 --- a/bank.yaml +++ b/bank.yaml @@ -1,4 +1,5 @@ --- + - hosts: bank roles: - common diff --git a/bar.yaml b/bar.yaml index 4ef9f78..32e4465 100644 --- a/bar.yaml +++ b/bar.yaml @@ -1,4 +1,5 @@ --- + - hosts: bank-pi.bitlair.nl vars: raspi_rotate_display: "2" diff --git a/common.yaml b/common.yaml index 755110a..fc949b9 100644 --- a/common.yaml +++ b/common.yaml @@ -1,4 +1,5 @@ --- + - hosts: debian roles: - common diff --git a/fotos.yaml b/fotos.yaml index d61fd5f..99f871c 100644 --- a/fotos.yaml +++ b/fotos.yaml @@ -1,4 +1,5 @@ --- + - hosts: fotos roles: - common diff --git a/git-ci.yaml b/git-ci.yaml index e2e557d..07982f4 100644 --- a/git-ci.yaml +++ b/git-ci.yaml @@ -1,4 +1,5 @@ --- + - hosts: git-ci roles: - common diff --git a/git.yaml b/git.yaml index 050090d..2a5ae7e 100644 --- a/git.yaml +++ b/git.yaml @@ -1,4 +1,5 @@ --- + - hosts: git roles: - common diff --git a/hosts.yaml b/inventory similarity index 100% rename from hosts.yaml rename to inventory diff --git a/monitoring.yaml b/monitoring.yaml index c439507..e8c3e78 100644 --- a/monitoring.yaml +++ b/monitoring.yaml @@ -1,4 +1,5 @@ --- + - hosts: monitoring roles: - common diff --git a/mqtt-internal.yaml b/mqtt-internal.yaml index 93a00a5..84297ef 100644 --- a/mqtt-internal.yaml +++ b/mqtt-internal.yaml @@ -1,4 +1,5 @@ --- + - hosts: mqtt_internal roles: - common diff --git a/music.yaml b/music.yaml index 2f77110..1c2431d 100644 --- a/music.yaml +++ b/music.yaml @@ -1,4 +1,5 @@ --- + - hosts: music roles: - common diff --git a/pad.yaml b/pad.yaml index 2325204..d9f6f3e 100644 --- a/pad.yaml +++ b/pad.yaml @@ -1,4 +1,5 @@ --- + - hosts: pad vars: acme_san_domains: diff --git a/roles/common-bitlair/tasks/main.yaml b/roles/common-bitlair/tasks/main.yaml index c28063b..78845a3 100644 --- a/roles/common-bitlair/tasks/main.yaml +++ b/roles/common-bitlair/tasks/main.yaml @@ -1,8 +1,8 @@ --- - name: Update authorized_keys - tags: authorized_keys ansible.builtin.template: src: authorized_keys.j2 dest: /root/.ssh/authorized_keys mode: 0600 when: root_access is defined and root_access + tags: authorized_keys diff --git a/roles/common/tasks/main.yaml b/roles/common/tasks/main.yaml index 0f19df2..2fcb2b4 100644 --- a/roles/common/tasks/main.yaml +++ b/roles/common/tasks/main.yaml @@ -1,13 +1,17 @@ --- -- tags: [ debian-upgrade, never ] + +- name: Import debian-upgrade.yaml if not bookworm ansible.builtin.import_tasks: file: debian-upgrade.yaml when: ansible_facts['distribution_release'] != "bookworm" + tags: [ debian-upgrade, never ] -- tags: debian_backports +- name: Import debian-backports.yaml ansible.builtin.import_tasks: file: debian-backports.yaml + tags: debian_backports + - tags: unattended_updates ansible.builtin.import_tasks: file: unattended-updates.yaml diff --git a/services.yaml b/services.yaml index 5bbd959..af77daf 100644 --- a/services.yaml +++ b/services.yaml @@ -1,4 +1,5 @@ --- + - hosts: services roles: - common diff --git a/www.yaml b/www.yaml index 4ee6399..f912d15 100644 --- a/www.yaml +++ b/www.yaml @@ -1,4 +1,5 @@ --- + - hosts: wiki roles: - common