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 (`studiovitali.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 (`studio.ansible`) containing reusable roles.
 
 Currently only supports Debian-based systems.

galaxy.yml

@@ -1,14 +1,11 @@
 ## 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
 license:
   - MIT
-
-dependencies:
-  "devsec.hardening": ">=9.0.0"

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
@@ -36,4 +36,13 @@
 #     mode: "0644"
 #   when: ansible_facts['os_family'] == "Debian"
 
-## SCHEDULE REBOOTS 4 kernel upgrades: with cron, unattended-upgrades or action workflows?
+- 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/docker/tasks/main.yml

@@ -1,5 +1,8 @@
 ---
-- name: Install Docker prerequisites
+- name: Install Docker
+  become: true
+  block:
+    - name: Install Docker prerequisites
       ansible.builtin.apt:
         name:
           - ca-certificates
@@ -7,9 +10,8 @@
           - python3-debian ## needed for the deb822 module
         state: present
         update_cache: true
-  become: true
 
-- name: Add Docker official APT repository (DEB822 format)
+    - name: Add Docker official APT repository (DEB822 format)
       ansible.builtin.deb822_repository:
         name: docker
         types: deb
@@ -18,9 +20,8 @@
         components: stable
         signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
         state: present
-  become: true
 
-- name: Install Docker CE packages
+    - name: Install Docker CE packages
       ansible.builtin.apt:
         name:
           - docker-ce
@@ -30,39 +31,41 @@
           - docker-compose-plugin
         state: present
         update_cache: true
-  become: true
 
-- name: Ensure Docker service is running and enabled
+    - name: Ensure Docker service is running and enabled
       ansible.builtin.service:
         name: docker
         state: started
         enabled: true
-  become: true
 
-- name: Add deployment user to docker group
+- name: Configure deployment user for Docker
+  when: deployment_public_ssh_key is defined
+  become: true
+  block:
+    - name: Add deployment user to docker group
       ansible.builtin.user:
         name: deployment
         groups: docker
         append: true
-  become: true
 
-- name: Create target for docker compose files
+    - name: Create target for docker compose
       ansible.builtin.file:
         path: /opt/docker
         state: directory
         owner: deployment
         group: deployment
         mode: "0755"
-  become: true
 
-- name: Create appuser group
+- name: Create app user for secure container execution
+  become: true
+  block:
+    - name: Create appuser group
       ansible.builtin.group:
         name: appuser
         state: present
         gid: 9999
-  become: true
 
-- name: Create app user for secure container execution
+    - name: Create appuser
       ansible.builtin.user:
         name: appuser
         state: present
@@ -71,4 +74,3 @@
         system: true
         shell: /usr/sbin/nologin
         create_home: false
-  become: true

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

@@ -1,20 +1,36 @@
 ---
 - name: Harden SSH configuration
-  ansible.builtin.import_role:
+  become: true
-    name: devsec.hardening.ssh_hardening
+  block:
-  vars:
+    - name: Create SSH drop-in directory
-    ssh_permit_root_login: "no"
+      ansible.builtin.file:
-    ssh_password_authentication: "no"
+        path: /etc/ssh/sshd_config.d
+        state: directory
+        owner: root
+        group: root
+        mode: "0755"
 
-- name: Install fail2ban
+    - name: Harden SSH configuration with drop-in template
+      ansible.builtin.template:
+        src: sshd.conf.j2
+        dest: /etc/ssh/sshd_config.d/sshd.conf
+        owner: root
+        group: root
+        mode: "0644"
+        validate: /usr/sbin/sshd -t -f %s
+      notify: Restart sshd
+
+- name: Enable fail2ban
+  become: true
+  block:
+    - name: Install fail2ban
       ansible.builtin.apt:
         name:
           - fail2ban
         state: present
-  become: true
 
-- name: Start fail2ban
+    - name: Start fail2ban
       ansible.builtin.service:
         name: fail2ban
         state: started
-    enabled: yes
+        enabled: true

roles/security/templates/sshd.conf.j2

@@ -0,0 +1,5 @@
+## Disable root login
+PermitRootLogin no
+
+## Disable password authentication
+PasswordAuthentication no

roles/users/tasks/main.yml

@@ -1,38 +1,42 @@
 ---
-- name: Create primary sysadmin user
+- name: Set up primary sysadmin user
+  when: sysadmin_public_ssh_key is defined
+  become: true
+  block:
+    - name: Create sysadmin user
       ansible.builtin.user:
         name: "{{ sysadmin_user }}"
         groups: sudo
         append: yes
         shell: /bin/bash
         create_home: yes
-  become: true
 
-- name: Add SSH public key for sysadmin
+    - name: Add SSH public key
       ansible.posix.authorized_key:
         user: "{{ sysadmin_user }}"
         state: present
         key: "{{ sysadmin_public_ssh_key }}"
-  become: true
 
-- name: Allow passwordless sudo for sudo group
+    - name: Allow passwordless sudo
       ansible.builtin.copy:
         dest: /etc/sudoers.d/sudo-nopasswd
         content: "%sudo ALL=(ALL) NOPASSWD: ALL"
         mode: "0440"
         validate: /usr/sbin/visudo -cf %s
-  become: true
 
-- name: Create deployment user for CI/CD
+
+- name: Set up deployment user for CI/CD
+  when: deployment_public_ssh_key is defined
+  become: true
+  block:
+    - name: Create deployment user
       ansible.builtin.user:
         name: deployment
         shell: /bin/bash
         create_home: yes
-  become: true
 
-- name: Add SSH public key for deployment user
+    - name: Add SSH public key
       ansible.posix.authorized_key:
         user: deployment
         state: present
         key: "{{ deployment_public_ssh_key }}"
-  become: true