From 32e80282efe5dfe33f88c38de60510ecc2ae8157 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Sat, 17 May 2025 17:17:01 +0300 Subject: [PATCH] Update ansible roles --- Taskfile.yml | 4 ++++ files/keep-files.py | 2 +- playbook-system.yml | 10 +--------- requirements.yml | 4 ++-- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index ce10b3f..56c3656 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -14,6 +14,10 @@ vars: sh: 'yq .ungrouped.hosts.server.ansible_host {{.HOSTS_FILE}}' tasks: + install-roles: + cmds: + - ansible-galaxy role install --role-file requirements.yml --force + ssh: cmds: - ssh {{.REMOTE_USER}}@{{.REMOTE_HOST}} diff --git a/files/keep-files.py b/files/keep-files.py index cea3062..72a330b 100644 --- a/files/keep-files.py +++ b/files/keep-files.py @@ -32,7 +32,7 @@ def main(): sorted_files = sorted(files) # Identify files to delete - to_delete = sorted_files[: -args.keep] if args.keep > 0 else sorted_files.copy() + to_delete = sorted_files[:-args.keep] if args.keep > 0 else sorted_files.copy() # Delete files and print results for filename in to_delete: diff --git a/playbook-system.yml b/playbook-system.yml index 20c8df8..e6b8fb0 100644 --- a/playbook-system.yml +++ b/playbook-system.yml @@ -25,21 +25,13 @@ name: "{{ apt_packages }}" update_cache: true - - name: "Configure timezone" - ansible.builtin.import_role: - name: yatesr.timezone - vars: - timezone: UTC - tags: - - skip_ansible_lint - - name: "Configure security settings" ansible.builtin.import_role: name: geerlingguy.security vars: security_ssh_permit_root_login: "yes" security_autoupdate_enabled: "no" - security_fail2ban_enabled: "yes" + security_fail2ban_enabled: true - name: "Copy keep files script" ansible.builtin.copy: diff --git a/requirements.yml b/requirements.yml index 5cd4001..aba9f86 100644 --- a/requirements.yml +++ b/requirements.yml @@ -3,7 +3,7 @@ version: 1.2.2 - src: geerlingguy.security - version: 2.4.0 + version: 3.0.0 - src: geerlingguy.docker - version: 7.4.3 + version: 7.4.7