feat: replace SSH hardening step with devsec.hardening role

remove validation step instead of running pointless validation on static template

galaxy.yml

@@ -9,3 +9,6 @@ authors:
 description: Studio Ansible collection containing common roles
 license:
   - MIT
+
+dependencies:
+  "devsec.hardening": ">=9.0.0"

meta/runtime.yml

@@ -0,0 +1,2 @@
+---
+requires_ansible: ">=2.15.0"

roles/docker/tasks/main.yml

@@ -4,39 +4,23 @@
     name:
       - ca-certificates
       - curl
+      - python3-debian ## needed for the deb822 module
     state: present
     update_cache: true
   become: true
 
-- name: Ensure APT keyrings directory exists
+- name: Add Docker official APT repository (DEB822 format)
-  ansible.builtin.file:
+  ansible.builtin.deb822_repository:
-    path: /etc/apt/keyrings
+    name: docker
-    state: directory
+    types: deb
-    mode: "0755"
+    uris: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}"
-  become: true
+    suites: "{{ ansible_facts['distribution_release'] }}"
-
+    components: stable
-- name: Download Docker official GPG key
+    signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
-  ansible.builtin.get_url:
-    url: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg"
-    dest: /etc/apt/keyrings/docker.asc
-    mode: "0644"
-  become: true
-
-- name: Get system architecture
-  ansible.builtin.command: dpkg --print-architecture
-  register: dpkg_architecture
-  changed_when: false
-  become: true
-
-- name: Add Docker official APT repository
-  ansible.builtin.apt_repository:
-    repo: "deb [arch={{ dpkg_architecture.stdout }} signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable"
     state: present
-    filename: docker
-    update_cache: yes
   become: true
 
-- name: Install modern Docker CE packages
+- name: Install Docker CE packages
   ansible.builtin.apt:
     name:
       - docker-ce
@@ -45,26 +29,16 @@
       - docker-buildx-plugin
       - docker-compose-plugin
     state: present
+    update_cache: true
   become: true
 
-- name: Ensure Docker services are running and enabled
+- name: Ensure Docker service is running and enabled
   ansible.builtin.service:
     name: docker
     state: started
     enabled: true
   become: true
 
-- name: Create docker user for container execution
-  ansible.builtin.user:
-    name: docker
-    state: present
-    system: true
-    shell: /usr/sbin/nologin
-    groups: docker
-    append: true
-    create_home: false
-  become: true
-
 - name: Add deployment user to docker group
   ansible.builtin.user:
     name: deployment
@@ -72,7 +46,7 @@
     append: true
   become: true
 
-- name: Create target for docker compose
+- name: Create target for docker compose files
   ansible.builtin.file:
     path: /opt/docker
     state: directory
@@ -80,3 +54,21 @@
     group: deployment
     mode: "0755"
   become: true
+
+- name: Create appuser group
+  ansible.builtin.group:
+    name: appuser
+    state: present
+    gid: 9999
+  become: true
+
+- name: Create app user for secure container execution
+  ansible.builtin.user:
+    name: appuser
+    state: present
+    uid: 9999
+    group: appuser
+    system: true
+    shell: /usr/sbin/nologin
+    create_home: false
+  become: true

roles/security/tasks/main.yml

@@ -1,23 +1,10 @@
 ---
-- name: Create SSH drop-in directory
+- name: Harden SSH configuration
-  ansible.builtin.file:
+  ansible.builtin.import_role:
-    path: /etc/ssh/sshd_config.d
+    name: devsec.hardening.ssh_hardening
-    state: directory
+  vars:
-    owner: root
+    ssh_permit_root_login: "no"
-    group: root
+    ssh_password_authentication: "no"
-    mode: "0755"
-  become: true
-
-- 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: "sshd -t -f %s"
-  notify: Restart sshd
-  become: true
 
 - name: Install fail2ban
   ansible.builtin.apt:

roles/security/templates/sshd.conf.j2

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

roles/users/tasks/main.yml

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