From fec4aec10a235e56d764f03f59df81d38fbc474e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Sachse?= <Joerg.Sachse@slub-dresden.de>
Date: Thu, 29 Jul 2021 12:35:13 +0200
Subject: [PATCH] refactor: remove task from single tasks all over the task
 files and use tag inheritance instead

---
 tasks/configure-iptables-externalusers.yml | 1 -
 tasks/configure-sftp-server.yml            | 7 -------
 tasks/configure-ssh-publickeys.yml         | 1 -
 tasks/create-users-groups.yml              | 5 -----
 4 files changed, 14 deletions(-)

diff --git a/tasks/configure-iptables-externalusers.yml b/tasks/configure-iptables-externalusers.yml
index 4c70d65..3cd72e9 100644
--- a/tasks/configure-iptables-externalusers.yml
+++ b/tasks/configure-iptables-externalusers.yml
@@ -18,4 +18,3 @@
   loop: "{{ vault_iptables | flatten(levels=1) }}"
   notify:
     - save iptables rules
-  tags: [iptables]
diff --git a/tasks/configure-sftp-server.yml b/tasks/configure-sftp-server.yml
index 875775c..a04639e 100644
--- a/tasks/configure-sftp-server.yml
+++ b/tasks/configure-sftp-server.yml
@@ -8,7 +8,6 @@
     state: present
   notify:
     - restart sshd
-  tags: [sftp]
 
 - name: Konfiguration fuer SFTP-Server einspielen
   block:
@@ -30,7 +29,6 @@
       register: externalFTP
       notify:
         - restart sshd
-      tags: [sftp]
 
     # http://sysadmin.circularvale.com/server-config/setting-a-umask-for-chrooted-sftp-users/
     - name: Konfiguration fuer SFTP-Server einspielen (2/3)
@@ -40,7 +38,6 @@
         backup: "yes"
       notify:
         - restart sshd
-      tags: [sftp]
 
     - name: Mountpoints fuer SFTP konfigurieren (3/3)
       block:
@@ -51,7 +48,6 @@
             owner: "root"
             group: "root"
             mode: "0755"
-          tags: [sftp]
         - name: Uploadverzeichnis konfigurieren
           file:
             path: "/home/{{vault_sftp_user}}/reports/"
@@ -59,8 +55,6 @@
             owner: "{{vault_sftp_user}}"
             group: "{{vault_sftp_user}}"
             mode: "0770"
-          tags: [sftp]
-  tags: [sftp]
 
 - name: Konfiguration fuer Default-SFTP-Server einspielen
   blockinfile:
@@ -74,4 +68,3 @@
   when: not externalFTP
   notify:
     - restart sshd
-  tags: [sftp]
diff --git a/tasks/configure-ssh-publickeys.yml b/tasks/configure-ssh-publickeys.yml
index 5fe8eaf..5c89ce2 100644
--- a/tasks/configure-ssh-publickeys.yml
+++ b/tasks/configure-ssh-publickeys.yml
@@ -7,4 +7,3 @@
     key: "{{ item.key }}"
     state: "{{ item.state | default('present') }}"
   loop: "{{ vault_authorized_keys | flatten(levels=1) }}"
-  tags: [ssh]
diff --git a/tasks/create-users-groups.yml b/tasks/create-users-groups.yml
index 7d3ecac..0703933 100644
--- a/tasks/create-users-groups.yml
+++ b/tasks/create-users-groups.yml
@@ -10,7 +10,6 @@
 #      msg: "{{ item }}END"
 #      verbosity: 1
 #    with_dict: "{{ users }}"
-#    tags: [ users ]
 
 - name: create groups
   group:
@@ -18,7 +17,6 @@
     gid: "{{ item.gid }}"
     state: "{{ item.state | default('present') }}"
   loop: "{{ vault_groups | flatten(levels=1) }}"
-  tags: [users]
 
 # do NOT run this before skel configuration has been rolled out!
 #  - name: create individual primary user group
@@ -27,7 +25,6 @@
 #      state: present
 #      gid: "{{ item.value.uid }}"
 #    with_dict: "{{ users }}"
-#    tags: [ users ]
 
 - name: create users
   user:
@@ -44,7 +41,6 @@
     uid: "{{ item.value.uid | default(omit) }}"
     update_password: "on_create"
   with_dict: "{{ vault_users }}"
-  tags: [users]
 
 - name: overwrite defective vimrc. skel files
   copy:
@@ -52,4 +48,3 @@
     dest: "/home/{{ item.key }}/.vimrc"
     remote_src: "yes"
   with_dict: "{{ vault_users }}"
-  tags: [users]
-- 
GitLab