From 0febef54bd18ef02b63fa93d7e1dbe448787f0fe Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 27 Mar 2020 00:12:00 +0100 Subject: [PATCH] update vars to avoid trouble --- tasks/main.yml | 4 ++-- vars/{archlinux.yml => sshd_archlinux.yml} | 0 vars/{centos.yml => sshd_centos.yml} | 0 vars/{default.yml => sshd_debian.yml} | 0 vars/sshd_default.yml | 10 ++++++++++ vars/{fedora.yml => sshd_fedora.yml} | 0 6 files changed, 12 insertions(+), 2 deletions(-) rename vars/{archlinux.yml => sshd_archlinux.yml} (100%) rename vars/{centos.yml => sshd_centos.yml} (100%) rename vars/{default.yml => sshd_debian.yml} (100%) create mode 100644 vars/sshd_default.yml rename vars/{fedora.yml => sshd_fedora.yml} (100%) diff --git a/tasks/main.yml b/tasks/main.yml index fefe669..6d3f9a9 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,10 +9,10 @@ - name: set sshd_service variable block: - name: read os specific variable - include_vars: "vars/{{ ansible_distribution | lower }}.yml" + include_vars: "vars/sshd_{{ ansible_distribution | lower }}.yml" rescue: - name: read default variable - include_vars: vars/default.yml + include_vars: vars/sshd_default.yml - name: Collect all users and groups allowed to login via ssh set_fact: diff --git a/vars/archlinux.yml b/vars/sshd_archlinux.yml similarity index 100% rename from vars/archlinux.yml rename to vars/sshd_archlinux.yml diff --git a/vars/centos.yml b/vars/sshd_centos.yml similarity index 100% rename from vars/centos.yml rename to vars/sshd_centos.yml diff --git a/vars/default.yml b/vars/sshd_debian.yml similarity index 100% rename from vars/default.yml rename to vars/sshd_debian.yml diff --git a/vars/sshd_default.yml b/vars/sshd_default.yml new file mode 100644 index 0000000..a6b6476 --- /dev/null +++ b/vars/sshd_default.yml @@ -0,0 +1,10 @@ +--- +sshd_service: ssh +sshd_key_types_list: + - ed25519 + - rsa + - ecdsa + - dsa + +sshd_xauth: + - xorg-xauth diff --git a/vars/fedora.yml b/vars/sshd_fedora.yml similarity index 100% rename from vars/fedora.yml rename to vars/sshd_fedora.yml