From 2027420877151cccc3e0b906e474852a1625e7b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= Date: Sun, 15 Apr 2018 16:59:00 +0200 Subject: [PATCH] whitespaces --- evolinux-users/tasks/ssh.yml | 9 ++++----- evolinux-users/tasks/ssh_allowusers.yml | 6 ++---- evolinux-users/tasks/user.yml | 10 +++++++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/evolinux-users/tasks/ssh.yml b/evolinux-users/tasks/ssh.yml index bf316ab8..20eac23a 100644 --- a/evolinux-users/tasks/ssh.yml +++ b/evolinux-users/tasks/ssh.yml @@ -38,17 +38,16 @@ - include: ssh_allowgroups.yml when: - - ssh_allowgroups - - not ssh_allowusers + - ssh_allowgroups + - not ssh_allowusers - include: ssh_allowusers.yml vars: user: "{{ item.value }}" with_dict: "{{ evolinux_users }}" when: - - ssh_allowusers - - not ssh_allowgroups - + - ssh_allowusers + - not ssh_allowgroups - name: disable root login replace: diff --git a/evolinux-users/tasks/ssh_allowusers.yml b/evolinux-users/tasks/ssh_allowusers.yml index 1e561415..db113494 100644 --- a/evolinux-users/tasks/ssh_allowusers.yml +++ b/evolinux-users/tasks/ssh_allowusers.yml @@ -41,8 +41,7 @@ insertafter: "# END EVOLINUX PASSWORD RESTRICTIONS BY ADDRESS" validate: '/usr/sbin/sshd -T -f %s' notify: reload sshd - when: - - grep_matchuser_ssh.rc != 0 + when: grep_matchuser_ssh.rc != 0 - name: "Append '{{ user.name }}' to Match User's sshd directive" replace: @@ -51,5 +50,4 @@ replace: '\1,{{ user.name }}' validate: '/usr/sbin/sshd -T -f %s' notify: reload sshd - when: - - grep_matchuser_ssh.rc == 0 + when: grep_matchuser_ssh.rc == 0 diff --git a/evolinux-users/tasks/user.yml b/evolinux-users/tasks/user.yml index bad260f5..49e88cbc 100644 --- a/evolinux-users/tasks/user.yml +++ b/evolinux-users/tasks/user.yml @@ -25,9 +25,11 @@ shell: /bin/bash password: '{{ user.password_hash }}' update_password: on_create - when: loginisbusy.rc != 0 and uidisbusy.rc != 0 + when: + - loginisbusy.rc != 0 + - uidisbusy.rc != 0 -- name: "Add Unix account with random uid for '{{ user.name }}'" +- name: "Unix account for '{{ user.name }}' is present (with random uid)" user: state: present name: '{{ user.name }}' @@ -35,7 +37,9 @@ shell: /bin/bash password: '{{ user.password_hash }}' update_password: on_create - when: loginisbusy.rc != 0 and uidisbusy.rc == 0 + when: + - loginisbusy.rc != 0 + - uidisbusy.rc == 0 # Unix groups