Merge branch 'main' into feat/backup

README.md

@@ -1,3 +1,5 @@
 # Ansible Collection
 
-Opinionated set of roles to configure reasonable defaults for newly provisioned Debian / Ubuntu VMs running Docker. 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 (`studio.ansible`) containing reusable roles.
+
+Currently only supports Debian-based systems.

galaxy.yml

@@ -3,8 +3,9 @@
 namespace: studio
 name: ansible
 readme: README.md
-version: 1.0.0
+version: 0.0.1
 authors:
   - Studio Vitali
 description: Studio Ansible collection containing common roles
-license: MIT
+license:
+  - MIT

meta/runtime.yml

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

roles/base/tasks/main.yml

@@ -10,7 +10,6 @@
     update_cache: true
     upgrade: dist
     cache_valid_time: 3600
-  when: ansible_facts['os_family'] == "Debian" ## only on Debian / Ubuntu systems
   become: true
 
 - name: Install essential system utilities
@@ -26,7 +25,6 @@
       - unattended-upgrades
     state: present
     update_cache: true
-  when: ansible_facts['os_family'] == "Debian"
   become: true
 #
 # - name: Enable unattended-upgrades
@@ -37,5 +35,3 @@
 #       APT::Periodic::Unattended-Upgrade "1";
 #     mode: "0644"
 #   when: ansible_facts['os_family'] == "Debian"
-
-## SCHEDULE REBOOTS 4 kernel upgrades: with cron, unattended-upgrades or action workflows?

roles/docker/tasks/main.yml

@@ -1,29 +1,52 @@
 ---
-- name: Install necessary Docker packages
+- name: Install Docker
+  become: true
+  block:
+    - name: Install Docker prerequisites
       ansible.builtin.apt:
         name:
-      - docker.io
+          - ca-certificates
-      - docker-compose
+          - curl
+          - python3-debian ## needed for the deb822 module
         state: present
-  when: ansible_facts['os_family'] == "Debian" ## Debian / Ubuntu
+        update_cache: true
-  become: true
 
-- name: Ensure Docker service is running
+    - name: Add Docker official APT repository (DEB822 format)
+      ansible.builtin.deb822_repository:
+        name: docker
+        types: deb
+        uris: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}"
+        suites: "{{ ansible_facts['distribution_release'] }}"
+        components: stable
+        signed_by: "https://download.docker.com/linux/{{ ansible_facts['distribution'] | lower }}/gpg"
+        state: present
+
+    - name: Install Docker CE packages
+      ansible.builtin.apt:
+        name:
+          - docker-ce
+          - docker-ce-cli
+          - containerd.io
+          - docker-buildx-plugin
+          - docker-compose-plugin
+        state: present
+        update_cache: true
+
+    - name: Ensure Docker service is running and enabled
       ansible.builtin.service:
         name: docker
         state: started
         enabled: true
 
-- name: Create docker user for container execution
+- 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: docker
+        name: deployment
-    state: present
-    system: true
-    shell: /usr/sbin/nologin
         groups: docker
         append: true
-    create_home: false
-  become: true
 
     - name: Create target for docker compose
       ansible.builtin.file:
@@ -32,4 +55,22 @@
         owner: deployment
         group: deployment
         mode: "0755"
+
+- name: Create app user for secure container execution
   become: true
+  block:
+    - name: Create appuser group
+      ansible.builtin.group:
+        name: appuser
+        state: present
+        gid: 9999
+
+    - name: Create appuser
+      ansible.builtin.user:
+        name: appuser
+        state: present
+        uid: 9999
+        group: appuser
+        system: true
+        shell: /usr/sbin/nologin
+        create_home: false

roles/security/handlers/main.yml

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

roles/security/tasks/main.yml

@@ -1,4 +1,7 @@
 ---
+- name: Harden SSH configuration
+  become: true
+  block:
     - name: Create SSH drop-in directory
       ansible.builtin.file:
         path: /etc/ssh/sshd_config.d
@@ -6,7 +9,6 @@
         owner: root
         group: root
         mode: "0755"
-  become: true
 
     - name: Harden SSH configuration with drop-in template
       ansible.builtin.template:
@@ -15,21 +17,19 @@
         owner: root
         group: root
         mode: "0644"
-    validate: "sshd -t -f %s"
       notify: Restart sshd
-  become: true
 
+- name: Enable fail2ban
+  become: true
+  block:
     - name: Install fail2ban
       ansible.builtin.apt:
         name:
           - fail2ban
         state: present
-  when: ansible_facts['os_family'] == "Debian"
-  become: true
 
     - name: Start fail2ban
       ansible.builtin.service:
         name: fail2ban
         state: started
         enabled: yes
-  when: ansible_facts['os_family'] == "Debian"

roles/users/tasks/main.yml

@@ -1,38 +1,42 @@
 ---
-# - name: Create primary admin user
+- name: Set up primary sysadmin user
-#   ansible.builtin.user:
+  when: sysadmin_public_ssh_key is defined
-#     name: sysadmin
+  become: true
-#     groups: sudo
+  block:
-#     append: yes
+    - name: Create sysadmin user
-#     shell: /bin/bash
+      ansible.builtin.user:
-#     create_home: yes
+        name: "{{ sysadmin_user }}"
-#   become: true
+        groups: sudo
+        append: yes
+        shell: /bin/bash
+        create_home: yes
 
-# - name: Add SSH public key for sysadmin
+    - name: Add SSH public key
-#   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
 
-# - name: Allow passwordless sudo to sysadmin user
+    - name: Allow passwordless sudo
-#   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
 
-- 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