Skip to content
Snippets Groups Projects
Commit fec4aec1 authored by Jörg Sachse's avatar Jörg Sachse
Browse files

refactor: remove task from single tasks all over the task files and use tag inheritance instead

parent 2af517c2
No related branches found
No related tags found
No related merge requests found
...@@ -18,4 +18,3 @@ ...@@ -18,4 +18,3 @@
loop: "{{ vault_iptables | flatten(levels=1) }}" loop: "{{ vault_iptables | flatten(levels=1) }}"
notify: notify:
- save iptables rules - save iptables rules
tags: [iptables]
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
state: present state: present
notify: notify:
- restart sshd - restart sshd
tags: [sftp]
- name: Konfiguration fuer SFTP-Server einspielen - name: Konfiguration fuer SFTP-Server einspielen
block: block:
...@@ -30,7 +29,6 @@ ...@@ -30,7 +29,6 @@
register: externalFTP register: externalFTP
notify: notify:
- restart sshd - restart sshd
tags: [sftp]
# http://sysadmin.circularvale.com/server-config/setting-a-umask-for-chrooted-sftp-users/ # http://sysadmin.circularvale.com/server-config/setting-a-umask-for-chrooted-sftp-users/
- name: Konfiguration fuer SFTP-Server einspielen (2/3) - name: Konfiguration fuer SFTP-Server einspielen (2/3)
...@@ -40,7 +38,6 @@ ...@@ -40,7 +38,6 @@
backup: "yes" backup: "yes"
notify: notify:
- restart sshd - restart sshd
tags: [sftp]
- name: Mountpoints fuer SFTP konfigurieren (3/3) - name: Mountpoints fuer SFTP konfigurieren (3/3)
block: block:
...@@ -51,7 +48,6 @@ ...@@ -51,7 +48,6 @@
owner: "root" owner: "root"
group: "root" group: "root"
mode: "0755" mode: "0755"
tags: [sftp]
- name: Uploadverzeichnis konfigurieren - name: Uploadverzeichnis konfigurieren
file: file:
path: "/home/{{vault_sftp_user}}/reports/" path: "/home/{{vault_sftp_user}}/reports/"
...@@ -59,8 +55,6 @@ ...@@ -59,8 +55,6 @@
owner: "{{vault_sftp_user}}" owner: "{{vault_sftp_user}}"
group: "{{vault_sftp_user}}" group: "{{vault_sftp_user}}"
mode: "0770" mode: "0770"
tags: [sftp]
tags: [sftp]
- name: Konfiguration fuer Default-SFTP-Server einspielen - name: Konfiguration fuer Default-SFTP-Server einspielen
blockinfile: blockinfile:
...@@ -74,4 +68,3 @@ ...@@ -74,4 +68,3 @@
when: not externalFTP when: not externalFTP
notify: notify:
- restart sshd - restart sshd
tags: [sftp]
...@@ -7,4 +7,3 @@ ...@@ -7,4 +7,3 @@
key: "{{ item.key }}" key: "{{ item.key }}"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
loop: "{{ vault_authorized_keys | flatten(levels=1) }}" loop: "{{ vault_authorized_keys | flatten(levels=1) }}"
tags: [ssh]
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
# msg: "{{ item }}END" # msg: "{{ item }}END"
# verbosity: 1 # verbosity: 1
# with_dict: "{{ users }}" # with_dict: "{{ users }}"
# tags: [ users ]
- name: create groups - name: create groups
group: group:
...@@ -18,7 +17,6 @@ ...@@ -18,7 +17,6 @@
gid: "{{ item.gid }}" gid: "{{ item.gid }}"
state: "{{ item.state | default('present') }}" state: "{{ item.state | default('present') }}"
loop: "{{ vault_groups | flatten(levels=1) }}" loop: "{{ vault_groups | flatten(levels=1) }}"
tags: [users]
# do NOT run this before skel configuration has been rolled out! # do NOT run this before skel configuration has been rolled out!
# - name: create individual primary user group # - name: create individual primary user group
...@@ -27,7 +25,6 @@ ...@@ -27,7 +25,6 @@
# state: present # state: present
# gid: "{{ item.value.uid }}" # gid: "{{ item.value.uid }}"
# with_dict: "{{ users }}" # with_dict: "{{ users }}"
# tags: [ users ]
- name: create users - name: create users
user: user:
...@@ -44,7 +41,6 @@ ...@@ -44,7 +41,6 @@
uid: "{{ item.value.uid | default(omit) }}" uid: "{{ item.value.uid | default(omit) }}"
update_password: "on_create" update_password: "on_create"
with_dict: "{{ vault_users }}" with_dict: "{{ vault_users }}"
tags: [users]
- name: overwrite defective vimrc. skel files - name: overwrite defective vimrc. skel files
copy: copy:
...@@ -52,4 +48,3 @@ ...@@ -52,4 +48,3 @@
dest: "/home/{{ item.key }}/.vimrc" dest: "/home/{{ item.key }}/.vimrc"
remote_src: "yes" remote_src: "yes"
with_dict: "{{ vault_users }}" with_dict: "{{ vault_users }}"
tags: [users]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment