bump

README.md

@@ -1,5 +1,3 @@
-# Ansible Collection
-
-Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides a ready-to-use Ansible Collection (`studio.ansible`) containing reusable roles.
+Opinionated set of roles to configure reasonable defaults for newly provisioned virtual machines. The repository provides a ready-to-use Ansible Collection (`studiovitali.ansible`) containing reusable roles.
 
 Currently only supports Debian-based systems.

galaxy.yml

@@ -1,9 +1,9 @@
 ## galaxy.yml
 
-namespace: studio
+namespace: studiovitali
 name: ansible
 readme: README.md
-version: 0.0.1
+version: 0.1.1
 authors:
   - Studio Vitali
 description: Studio Ansible collection containing common roles

roles/backup/defaults/main.yml

@@ -1,14 +0,0 @@
-# ansible/roles/backup/defaults/main.yml
----
-## Directories to include in the backup
-backup_include_paths:
-  - /etc
-  - /opt/docker
-
-## Directories to exclude from the backup
-backup_exclude_paths: [] ## Nothing to exclude
-
-## Restic retention policy
-backup_retention_daily: 7
-backup_retention_weekly: 4
-backup_retention_monthly: 6

roles/backup/tasks/main.yml

@@ -1,61 +0,0 @@
----
-- name: Install restic
-  ansible.builtin.apt:
-    name: restic
-    state: present
-
-- name: Initialize restic repository
-  environment:
-    RESTIC_REPOSITORY: "{{ vault_restic_repo_url }}"
-    RESTIC_PASSWORD: "{{ vault_restic_password }}"
-    AWS_ACCESS_KEY_ID: "{{ vault_aws_access_key }}"
-    AWS_SECRET_ACCESS_KEY: "{{ vault_aws_secret_key }}"
-  block:
-    - name: Check if already initialized
-      ansible.builtin.command: restic snapshots
-      register: restic_check
-      failed_when: false
-      changed_when: false
-
-    - name: Initialize repository
-      ansible.builtin.command: restic init
-      when: restic_check.rc != 0
-
-- name: Deploy restic environment file
-  ansible.builtin.template:
-    src: restic-backup.env.j2
-    dest: /etc/restic-backup.env
-    owner: root
-    group: root
-    mode: "0600" ## only root can read this file
-
-- name: Deploy restic backup script
-  ansible.builtin.template:
-    src: restic-backup.sh.j2
-    dest: /usr/local/bin/restic-backup.sh
-    owner: root
-    group: root
-    mode: "0700" ## only root can execute the script
-
-- name: Deploy restic systemd service
-  ansible.builtin.template:
-    src: restic-backup.service.j2
-    dest: /etc/systemd/system/restic-backup.service
-    owner: root
-    group: root
-    mode: "0644"
-
-- name: Deploy restic systemd timer
-  ansible.builtin.template:
-    src: restic-backup.timer.j2
-    dest: /etc/systemd/system/restic-backup.timer
-    owner: root
-    group: root
-    mode: "0644"
-
-- name: Enable and start backup timer
-  ansible.builtin.systemd:
-    name: restic-backup.timer
-    enabled: yes
-    state: started
-    daemon_reload: yes

roles/backup/templates/restic-backup.env.j2

@@ -1,5 +0,0 @@
-# Ansible managed
-RESTIC_REPOSITORY="{{ vault_restic_repo_url }}"
-RESTIC_PASSWORD="{{ vault_restic_password }}"
-AWS_ACCESS_KEY_ID="{{ vault_aws_access_key }}"
-AWS_SECRET_ACCESS_KEY="{{ vault_aws_secret_key }}"

roles/backup/templates/restic-backup.service.j2

@@ -1,8 +0,0 @@
-[Unit]
-Description=Run Restic Backup
-After=network-online.target
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/restic-backup.env
-ExecStart=/usr/local/bin/restic-backup.sh

roles/backup/templates/restic-backup.sh.j2

@@ -1,30 +0,0 @@
-#!/bin/bash
-## Ansible managed
-
-set -e
-
-# Source environment variables if running manually/outside Systemd
-if [ -f /etc/restic-backup.env ]; then
-  # shellcheck source=/dev/null
-  . /etc/restic-backup.env
-fi
-
-echo "Starting Restic Backup at $(date)"
-
-## Run the backup using paths and exclusions defined as group_vars
-restic backup \
-{% for path in backup_include_paths %}
-  "{{ path }}" \
-{% endfor %}
-{% for path in backup_exclude_paths %}
-  --exclude "{{ path }}" \
-{% endfor %}
-  --cleanup-cache
-
-restic forget \
-  --prune \
-  --keep-daily {{ backup_retention_daily }} \
-  --keep-weekly {{ backup_retention_weekly }} \
-  --keep-monthly {{ backup_retention_monthly }}
-
-echo "Restic backup completed at $(date)"

roles/backup/templates/restic-backup.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=Run Restic Backup
-
-[Timer]
-OnCalendar=*-*-* 04:00:00
-Persistent=true
-RandomizedDelaySec=1800
-
-[Install]
-WantedBy=timers.target

roles/base/defaults/main.yml

@@ -9,6 +9,6 @@ base_packages:
   - rsync
   - unzip
   - unattended-upgrades
-  # - acl ## needed for Ansible to become unprivileged user
+  # - acl ## needed for ansible to become unprivileged user
   # - python3-pip
   # - wget

roles/base/tasks/main.yml

@@ -26,7 +26,7 @@
     state: present
     update_cache: true
   become: true
-#
+
 # - name: Enable unattended-upgrades
 #   ansible.builtin.copy:
 #     dest: /etc/apt/apt.conf.d/20auto-upgrades
@@ -35,3 +35,14 @@
 #       APT::Periodic::Unattended-Upgrade "1";
 #     mode: "0644"
 #   when: ansible_facts['os_family'] == "Debian"
+
+- name: Check if reboot is required
+  ansible.builtin.stat:
+    path: /var/run/reboot-required
+  register: reboot_required_file
+
+- name: Reboot host if necessary
+  ansible.builtin.reboot:
+    post_reboot_delay: 10
+  become: true
+  when: reboot_required_file.stat.exists

roles/security/handlers/main.yml

@@ -1,5 +1,6 @@
 ---
 - name: Restart sshd
+  become: true
   ansible.builtin.service:
     name: ssh
     state: restarted

roles/security/tasks/main.yml

@@ -17,6 +17,7 @@
         owner: root
         group: root
         mode: "0644"
+        validate: /usr/sbin/sshd -t -f %s
       notify: Restart sshd
 
 - name: Enable fail2ban
@@ -32,4 +33,4 @@
       ansible.builtin.service:
         name: fail2ban
         state: started
-        enabled: yes
+        enabled: true