X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fbase%2Ftasks%2Fmain.yaml;fp=ansible%2Froles%2Fbase%2Ftasks%2Fmain.yaml;h=c62d223a5f90ac3fd5903ec5f50d35642a92c702;hb=41dfd44f1520728da65e43abc6fddfb59b2fed78;hp=1e53273b4afec27d87de9100b1ef1b18c6b272ac;hpb=d9a3cc9eb4fcbab709d6be1ea5b46dfdd88e48cc;p=noc.git diff --git a/ansible/roles/base/tasks/main.yaml b/ansible/roles/base/tasks/main.yaml index 1e53273..c62d223 100644 --- a/ansible/roles/base/tasks/main.yaml +++ b/ansible/roles/base/tasks/main.yaml @@ -1,4 +1,9 @@ --- +- set_fact: + sshd_allowusers: >- + {{ [ 'root' ] | union(sshd_allowusers_group | default([])) + | union(sshd_allowusers_host | default([])) }} + - name: only allow pubkey auth for root lineinfile: dest: /etc/ssh/sshd_config @@ -10,7 +15,7 @@ lineinfile: dest: /etc/ssh/sshd_config regexp: "^#?AllowUsers" - line: "AllowUsers {{ ' '.join([ 'root' ] | union(sshd_allowusers_group | default([])) | union(sshd_allowusers_host | default([]))) }}" + line: "AllowUsers {{ ' '.join(sshd_allowusers) }}" when: sshd_allowusers_set is defined and sshd_allowgroup is not defined notify: restart ssh @@ -32,7 +37,7 @@ name: "{{ item }}" groups: "{{ sshd_allowgroup }}" append: True - with_items: "{{ [ 'root' ] | union(sshd_allowusers_group | default([])) | union(sshd_allowusers_host | default([])) }}" + with_items: "{{ sshd_allowusers }}" when: sshd_allowgroup is defined