diff --git a/tasks/apt/cleanup.yaml b/tasks/apt/cleanup.yaml index 1985523..d83921e 100644 --- a/tasks/apt/cleanup.yaml +++ b/tasks/apt/cleanup.yaml @@ -2,7 +2,6 @@ # apt cleanup - name: "apt cleanup" - tags: "apt-cleanup" block: # clean apt cache diff --git a/tasks/apt/config.yaml b/tasks/apt/config.yaml index d8fcf5a..1c8e312 100644 --- a/tasks/apt/config.yaml +++ b/tasks/apt/config.yaml @@ -2,7 +2,6 @@ # apt config - name: "apt config" - tags: "apt" block: # configure apt auto update diff --git a/tasks/apt/packages.yaml b/tasks/apt/packages.yaml index 720d998..e2fcf15 100644 --- a/tasks/apt/packages.yaml +++ b/tasks/apt/packages.yaml @@ -2,7 +2,6 @@ # apt packages - name: "apt packages" - tags: "apt" block: # install packages diff --git a/tasks/apt/sources.yaml b/tasks/apt/sources.yaml index a0dae9e..a4bf71f 100644 --- a/tasks/apt/sources.yaml +++ b/tasks/apt/sources.yaml @@ -2,7 +2,6 @@ # manage apt sources - name: "manage apt sources" - tags: "apt" block: # configure legacy apt sources diff --git a/tasks/apt/update.yaml b/tasks/apt/update.yaml index 324610e..9321f66 100644 --- a/tasks/apt/update.yaml +++ b/tasks/apt/update.yaml @@ -2,7 +2,6 @@ # apt update - name: "apt update" - tags: "apt-update" when: 'ansible_facts["os_family"] == "Debian"' block: diff --git a/tasks/cron.yaml b/tasks/cron.yaml index c487133..fe8a1bd 100644 --- a/tasks/cron.yaml +++ b/tasks/cron.yaml @@ -11,7 +11,6 @@ when: - "ansible_facts['os_family'] == 'Debian'" - "ansible_facts['virtualization_type'] == 'lxc'" - tags: "cron" # configure cron - name: "cron - config - alpine" @@ -22,4 +21,3 @@ group: "root" mode: "0600" when: 'ansible_facts["os_family"] == "Alpine"' - tags: "cron" diff --git a/tasks/environment.yaml b/tasks/environment.yaml index 5c79b07..a6e6097 100644 --- a/tasks/environment.yaml +++ b/tasks/environment.yaml @@ -9,4 +9,3 @@ group: "root" mode: "0644" when: 'ansible_facts["distribution"] == "Ubuntu"' - tags: "environment-file" diff --git a/tasks/firewall.yaml b/tasks/firewall.yaml index 29d07ab..048d5d2 100644 --- a/tasks/firewall.yaml +++ b/tasks/firewall.yaml @@ -2,7 +2,6 @@ # generic settings - name: "firewall - set default policy and enable logging" - tags: "firewall" block: # set vars diff --git a/tasks/hostname.yaml b/tasks/hostname.yaml index 697d8f1..fa80aab 100644 --- a/tasks/hostname.yaml +++ b/tasks/hostname.yaml @@ -5,7 +5,6 @@ ansible.builtin.hostname: name: "{{ set_hostname | default(inventory_hostname_short) }}" use: "{{ hostname_use_method }}" - tags: "hostname" # manage /etc/hosts - name: "manage /etc/hosts file for hostname" @@ -14,6 +13,4 @@ regexp: '^{{ ansible_facts["default_ipv4"].address }}\s+.*{{ inventory_hostname_short }}.*$' line: "{{ ansible_facts['default_ipv4'].address }} {{ inventory_hostname }} {{ inventory_hostname_short }}" backup: true - tags: - - "hostfile" - - "hostname" + tags: "hostfile" diff --git a/tasks/journald.yaml b/tasks/journald.yaml index ef5704d..8ec86c5 100644 --- a/tasks/journald.yaml +++ b/tasks/journald.yaml @@ -10,4 +10,3 @@ mode: "0644" when: 'ansible_facts["distribution"] == "Ubuntu"' notify: "restart journald" - tags: "journald" diff --git a/tasks/lldpd.yaml b/tasks/lldpd.yaml index baf5bb6..ea02ca2 100644 --- a/tasks/lldpd.yaml +++ b/tasks/lldpd.yaml @@ -8,4 +8,3 @@ cache_valid_time: 3600 when: 'ansible_facts["os_family"] == "Debian"' notify: "restart lldpd" - tags: "lldp" diff --git a/tasks/locale.yaml b/tasks/locale.yaml index 0f3c28f..91f2153 100644 --- a/tasks/locale.yaml +++ b/tasks/locale.yaml @@ -5,4 +5,3 @@ community.general.locale_gen: name: "en_US.UTF-8" state: "present" - tags: "locale" diff --git a/tasks/lxd.yaml b/tasks/lxd.yaml index ecd5183..42827c7 100644 --- a/tasks/lxd.yaml +++ b/tasks/lxd.yaml @@ -7,4 +7,3 @@ state: "absent" purge: true when: 'ansible_facts["os_family"] == "Debian"' - tags: "lxd" diff --git a/tasks/main.yaml b/tasks/main.yaml index c89c56d..57672b6 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -105,13 +105,17 @@ # service - name: "service" - ansible.builtin.include_tasks: "service.yaml" + ansible.builtin.include_tasks: + file: "service.yaml" + apply: + tags: "service" loop: "{{ service }}" loop_control: loop_var: "__service" when: - "service is defined" - "ansible_facts['os_family'] == 'Debian'" + tags: "service" # flush handler - name: "flush handlers" @@ -162,7 +166,10 @@ # systemctl - name: "sysctl - set systemctl" - ansible.builtin.include_tasks: "systemctl.yaml" + ansible.builtin.include_tasks: + file: "systemctl.yaml" + apply: + tags: "systemctl" loop: "{{ systemctl }}" loop_control: loop_var: "__systemctl" @@ -210,7 +217,10 @@ # user - name: "user - create users" - ansible.builtin.include_tasks: "user.yaml" + ansible.builtin.include_tasks: + file: "user.yaml" + apply: + tags: "usermanagement" loop: "{{ users }}" loop_control: loop_var: "__user" diff --git a/tasks/motd.yaml b/tasks/motd.yaml index e78a6a1..f59779d 100644 --- a/tasks/motd.yaml +++ b/tasks/motd.yaml @@ -1,7 +1,6 @@ --- - name: "manage motd" - tags: "motd" block: # cleanup old motd debian diff --git a/tasks/ntp.yaml b/tasks/ntp.yaml index d14fe93..3401a58 100644 --- a/tasks/ntp.yaml +++ b/tasks/ntp.yaml @@ -1,7 +1,6 @@ --- - name: "manage ntp" - tags: "ntp" block: # install alpine diff --git a/tasks/snap/snap_daemon.yaml b/tasks/snap/snap_daemon.yaml index 847958d..e41afc2 100644 --- a/tasks/snap/snap_daemon.yaml +++ b/tasks/snap/snap_daemon.yaml @@ -2,7 +2,6 @@ # manage snapd - name: "manage snapd" - tags: "snap" block: # set defaults diff --git a/tasks/snap/snap_package.yaml b/tasks/snap/snap_package.yaml index 818f673..ab14408 100644 --- a/tasks/snap/snap_package.yaml +++ b/tasks/snap/snap_package.yaml @@ -9,4 +9,3 @@ loop: "{{ snap_package }}" loop_control: loop_var: "__snap_package" - tags: "snap" diff --git a/tasks/sshd.yaml b/tasks/sshd.yaml index 402811d..d143c3d 100644 --- a/tasks/sshd.yaml +++ b/tasks/sshd.yaml @@ -10,7 +10,6 @@ mode: "0644" notify: "restart ssh" when: 'ansible_facts["os_family"] == "Debian"' - tags: "sshd" # configure sshd - name: "config - sshd" @@ -22,4 +21,3 @@ mode: "0644" notify: "restart ssh alpine" when: 'ansible_facts["os_family"] == "Alpine"' - tags: "sshd" diff --git a/tasks/swap.yaml b/tasks/swap.yaml index f3d276c..c84cfb7 100644 --- a/tasks/swap.yaml +++ b/tasks/swap.yaml @@ -2,7 +2,6 @@ # manage swap - name: "manage swap" - tags: "swap" block: # enable or disable swap diff --git a/tasks/sysctl.yaml b/tasks/sysctl.yaml index 960e3e2..98732bc 100644 --- a/tasks/sysctl.yaml +++ b/tasks/sysctl.yaml @@ -9,4 +9,3 @@ loop: "{{ sysctl }}" loop_control: loop_var: "__sysctl" - tags: "sysctl" diff --git a/tasks/syslog/config.yaml b/tasks/syslog/config.yaml index 33f2850..c27b420 100644 --- a/tasks/syslog/config.yaml +++ b/tasks/syslog/config.yaml @@ -2,7 +2,6 @@ # manage syslog - name: "manage syslog" - tags: "syslog" block: # configure syslog - alpine diff --git a/tasks/syslog/install.yaml b/tasks/syslog/install.yaml index bc2ac70..57f49f7 100644 --- a/tasks/syslog/install.yaml +++ b/tasks/syslog/install.yaml @@ -7,4 +7,3 @@ state: "present" cache_valid_time: 3600 when: 'ansible_facts["os_family"] == "Debian"' - tags: "syslog" diff --git a/tasks/systemctl.yaml b/tasks/systemctl.yaml index c1c7d10..60326fa 100644 --- a/tasks/systemctl.yaml +++ b/tasks/systemctl.yaml @@ -10,4 +10,3 @@ mode: "0644" when: 'ansible_facts["os_family"] == "Debian"' notify: "daemon-reload fstrim.timer" - tags: "systemctl" diff --git a/tasks/telemetry.yaml b/tasks/telemetry.yaml index 6d12498..4695bdd 100644 --- a/tasks/telemetry.yaml +++ b/tasks/telemetry.yaml @@ -6,4 +6,3 @@ path: "/etc/cron.daily/popularity-contest" state: "absent" when: 'ansible_facts["distribution"] == "Ubuntu"' - tags: "telemetry" diff --git a/tasks/timezone.yaml b/tasks/timezone.yaml index f04fd0e..1b42cc5 100644 --- a/tasks/timezone.yaml +++ b/tasks/timezone.yaml @@ -4,4 +4,3 @@ - name: "timezone - set {{ timezone }}" community.general.timezone: name: "{{ timezone }}" - tags: "timezone"