From fffae747b98fa20605a99effb6dd1ad2dd00050c Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Thu, 2 Jul 2020 07:12:05 +0200
Subject: [PATCH] update role definitions for new ansible version

---
 tasks/home.yml         | 2 +-
 tasks/linger.yml       | 4 ++--
 tasks/setup_Debian.yml | 9 ++++-----
 tasks/ssh.yml          | 6 +++---
 tasks/user_groups.yml  | 2 +-
 tasks/users.yml        | 6 +++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tasks/home.yml b/tasks/home.yml
index 1647bc0..8ea4076 100644
--- a/tasks/home.yml
+++ b/tasks/home.yml
@@ -7,4 +7,4 @@
     group: "{{ item }}"
     mode: "{{ users[item].homedir_mode | default(700) }}"
     state: directory
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
diff --git a/tasks/linger.yml b/tasks/linger.yml
index 8413e44..2c861c7 100644
--- a/tasks/linger.yml
+++ b/tasks/linger.yml
@@ -4,7 +4,7 @@
   stat:
     path: /var/lib/systemd/linger/{{item}}
   register: _users_systemd_linger_stat
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
   when:
     - users[item].linger is defined
 
@@ -13,7 +13,7 @@
     loginctl
     {{ users[item].linger | ternary('enable','disable') }}-linger
     {{item}}
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
   when:
     - users[item].linger is defined
     - (
diff --git a/tasks/setup_Debian.yml b/tasks/setup_Debian.yml
index cf349f1..26e640d 100644
--- a/tasks/setup_Debian.yml
+++ b/tasks/setup_Debian.yml
@@ -1,8 +1,7 @@
 ---
 
 - name: install debian packages
-  package:
-    name: "{{ item }}"
-  with_items:
-    - dbus
-    - libpam-systemd
+  apt:
+    pkg:
+      - dbus
+      - libpam-systemd
diff --git a/tasks/ssh.yml b/tasks/ssh.yml
index 304596c..1e72fd5 100644
--- a/tasks/ssh.yml
+++ b/tasks/ssh.yml
@@ -5,7 +5,7 @@
     name: "{{ item }}"
     generate_ssh_key: yes
     ssh_key_type: ed25519
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
 
 - name: ssh directory
   file:
@@ -14,7 +14,7 @@
     group: "{{ item }}"
     mode: "700"
     state: directory
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
 
 - name: ssh authorized keys
   template:
@@ -22,5 +22,5 @@
     dest: "{{ users[item].home | default('/home/'+item) }}/.ssh/authorized_keys"
     owner: "{{ item }}"
     group: "{{ item }}"
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
   when: users[item].ssh_authorized_keys is defined
diff --git a/tasks/user_groups.yml b/tasks/user_groups.yml
index 26e7cd5..f23b62c 100644
--- a/tasks/user_groups.yml
+++ b/tasks/user_groups.yml
@@ -4,4 +4,4 @@
   group:
     name: "{{ item }}"
     gid: "{{ user_groups[item].gid }}"
-  with_items: "{{ user_groups.keys() }}"
+  loop: "{{ user_groups.keys() | list }}"
diff --git a/tasks/users.yml b/tasks/users.yml
index d20774c..cdbba00 100644
--- a/tasks/users.yml
+++ b/tasks/users.yml
@@ -4,7 +4,7 @@
   group:
     name: "{{ item }}"
     gid: "{{ users[item].gid }}"
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
   when: users[item].gid is defined
 
 - name: account
@@ -15,12 +15,12 @@
     uid: "{{ users[item].uid }}"
     home: "{{ users[item].home | default('/home/'+item) }}"
     shell: "{{ users[item].shell | default('/usr/bin/fish') }}"
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
   notify: restart systemd-logind.service
 
 - name: password
   user:
     name: "{{ item }}"
     password: "{{ users[item].password }}"
-  with_items: "{{ users.keys() }}"
+  loop: "{{ users.keys() | list }}"
   when: users[item].password is defined