From 592085aea15bfd9c3ef6164adf6be6c14a093f52 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sun, 11 Jun 2023 15:52:14 +0200 Subject: [PATCH] Moved essential configuration into system role --- roles/system/defaults/main.yml | 4 +++ roles/system/tasks/main.yml | 5 ++++ roles/system/tasks/packages.yml | 5 ++++ .../system/tasks/repo.yml | 25 +------------------ roles/system/tasks/shell.yml | 13 ++++++++++ roles/system/tasks/ssh.yml | 19 ++++++++++++++ run.yml | 4 +-- 7 files changed, 49 insertions(+), 26 deletions(-) create mode 100644 roles/system/defaults/main.yml create mode 100644 roles/system/tasks/main.yml create mode 100644 roles/system/tasks/packages.yml rename tasks/essential.yml => roles/system/tasks/repo.yml (51%) create mode 100644 roles/system/tasks/shell.yml create mode 100644 roles/system/tasks/ssh.yml diff --git a/roles/system/defaults/main.yml b/roles/system/defaults/main.yml new file mode 100644 index 0000000..40ebff1 --- /dev/null +++ b/roles/system/defaults/main.yml @@ -0,0 +1,4 @@ +username: user +packages: + - pfetch + - neovim diff --git a/roles/system/tasks/main.yml b/roles/system/tasks/main.yml new file mode 100644 index 0000000..6493b12 --- /dev/null +++ b/roles/system/tasks/main.yml @@ -0,0 +1,5 @@ +--- +- include_tasks: ssh.yml +- include_tasks: repo.yml +- include_tasks: packages.yml +- include_tasks: shell.yml diff --git a/roles/system/tasks/packages.yml b/roles/system/tasks/packages.yml new file mode 100644 index 0000000..1e57351 --- /dev/null +++ b/roles/system/tasks/packages.yml @@ -0,0 +1,5 @@ +--- +- name: Install essential packages + community.general.apk: + name: "{{ base_packages }}" + state: latest diff --git a/tasks/essential.yml b/roles/system/tasks/repo.yml similarity index 51% rename from tasks/essential.yml rename to roles/system/tasks/repo.yml index d1d3586..967adfe 100644 --- a/tasks/essential.yml +++ b/roles/system/tasks/repo.yml @@ -1,22 +1,4 @@ -- name: Disable SSH password auth - lineinfile: - path: /etc/ssh/sshd_config - regexp: "^#PasswordAuthentication yes" - line: "PasswordAuthentication no" - register: sshd_config - -- name: Restart sshd - service: - name: sshd - state: restarted - when: sshd_config.changed - -- name: Enable ssh on boot - service: - name: sshd - enabled: true - state: started - +--- - name: Use alpine edge branch/version replace: path: /etc/apk/repositories @@ -33,8 +15,3 @@ community.general.apk: update_cache: true upgrade: true - -- name: Install essential packages - community.general.apk: - name: "{{ base_packages }}" - state: latest diff --git a/roles/system/tasks/shell.yml b/roles/system/tasks/shell.yml new file mode 100644 index 0000000..f3752c0 --- /dev/null +++ b/roles/system/tasks/shell.yml @@ -0,0 +1,13 @@ +- name: Show pfetch on login + lineinfile: + path: /etc/profile.d/pfetch.sh + create: true + search_string: "^pfetch" + line: "pfetch" + +- name: Make neovim the default editor + lineinfile: + path: /etc/profile.d/editor.sh + create: true + search_string: "^export EDITOR=neovim" + line: "export EDITOR=nvim" diff --git a/roles/system/tasks/ssh.yml b/roles/system/tasks/ssh.yml new file mode 100644 index 0000000..9301f50 --- /dev/null +++ b/roles/system/tasks/ssh.yml @@ -0,0 +1,19 @@ +--- +- name: Disable SSH password auth + lineinfile: + path: /etc/ssh/sshd_config + regexp: "^#PasswordAuthentication yes" + line: "PasswordAuthentication no" + register: sshd_config + +- name: Restart sshd + service: + name: sshd + state: restarted + when: sshd_config.changed + +- name: Enable ssh on boot + service: + name: sshd + enabled: true + state: started diff --git a/run.yml b/run.yml index c4133f3..f2db50b 100644 --- a/run.yml +++ b/run.yml @@ -2,5 +2,5 @@ - hosts: all become: yes - tasks: - - import_tasks: tasks/essential.yml + roles: + - role: system -- 2.38.5