From 80c52199ef7de4adc72bad0914ad050abdb70e6f Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Mon, 27 Feb 2023 17:12:08 +0100 Subject: [PATCH] core: Fix ansible errors Signed-off-by: Noah Knegt --- roles/base/tasks/system/openssh.yml | 2 +- roles/base/tasks/users/ansible.yml | 2 +- roles/base/tasks/users/noahk.yml | 2 +- roles/base/templates/sshd_config.j2 | 1 - roles/base/vars/{arch.yml => Archlinux.yml} | 0 roles/base/vars/{debian.yml => Debian.yml} | 0 roles/base/vars/ubuntu.yml | 13 ------------- 7 files changed, 3 insertions(+), 17 deletions(-) rename roles/base/vars/{arch.yml => Archlinux.yml} (100%) rename roles/base/vars/{debian.yml => Debian.yml} (100%) delete mode 100644 roles/base/vars/ubuntu.yml diff --git a/roles/base/tasks/system/openssh.yml b/roles/base/tasks/system/openssh.yml index b3beb47..14f95ed 100644 --- a/roles/base/tasks/system/openssh.yml +++ b/roles/base/tasks/system/openssh.yml @@ -9,7 +9,7 @@ --- - name: Install or update openssh - apt: + package: name: "{{ openssh_package }}" state: latest notify: diff --git a/roles/base/tasks/users/ansible.yml b/roles/base/tasks/users/ansible.yml index 559d29c..3c0c457 100644 --- a/roles/base/tasks/users/ansible.yml +++ b/roles/base/tasks/users/ansible.yml @@ -24,7 +24,7 @@ - name: Add ansible user to sudoers copy: - src: files/ansible_sudoers + src: ansible/ansible_sudoers dest: /etc/sudoers.d/ansible owner: root group: root diff --git a/roles/base/tasks/users/noahk.yml b/roles/base/tasks/users/noahk.yml index 92f9155..530c366 100644 --- a/roles/base/tasks/users/noahk.yml +++ b/roles/base/tasks/users/noahk.yml @@ -24,7 +24,7 @@ - name: Add user to sudoers copy: - src: files/noahk_sudoers + src: noahk/noahk_sudoers dest: /etc/sudoers.d/noahk owner: root group: root diff --git a/roles/base/templates/sshd_config.j2 b/roles/base/templates/sshd_config.j2 index e39dbf0..3e270bf 100644 --- a/roles/base/templates/sshd_config.j2 +++ b/roles/base/templates/sshd_config.j2 @@ -26,7 +26,6 @@ IgnoreRhosts yes # Misc. options AcceptEnv LANG LC_* TCPKeepAlive yes -Subsystem sftp {{ sftp_path }} # Logging SyslogFacility AUTH diff --git a/roles/base/vars/arch.yml b/roles/base/vars/Archlinux.yml similarity index 100% rename from roles/base/vars/arch.yml rename to roles/base/vars/Archlinux.yml diff --git a/roles/base/vars/debian.yml b/roles/base/vars/Debian.yml similarity index 100% rename from roles/base/vars/debian.yml rename to roles/base/vars/Debian.yml diff --git a/roles/base/vars/ubuntu.yml b/roles/base/vars/ubuntu.yml deleted file mode 100644 index 44719b3..0000000 --- a/roles/base/vars/ubuntu.yml +++ /dev/null @@ -1,13 +0,0 @@ -#=================================================================================================== -# ? ABOUT -# @author : Noah Knegt -# @email : personal@noahknegt.com -# @repo : https://git.noahknegt.com/noah.knegt/ansible-automations -# @createdOn : 27-02-2023 -# @description : This file contains all the variables for the base role, for the ubuntu OS. -#=================================================================================================== - ---- -sudo_group: sudo -openssh_service: ssh -openssh_package: openssh-server