fix: arch discovery

refactor repository steps following official docker installation steps

meta/runtime.yml

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

roles/base/tasks/main.yml

@@ -35,3 +35,5 @@
 #       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,27 +1,42 @@
 ---
-- name: Install Docker
-  become: true
-  block:
-    - name: Install Docker prerequisites
+- name: Install Docker prerequisites
   ansible.builtin.apt:
     name:
       - ca-certificates
       - curl
-          - python3-debian ## needed for the deb822 module
     state: present
     update_cache: true
+  become: true
 
-    - 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"
+- name: Ensure APT keyrings directory exists
+  ansible.builtin.file:
+    path: /etc/apt/keyrings
+    state: directory
+    mode: "0755"
+  become: true
+
+- name: Download Docker official GPG key
+  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 Docker CE packages
+- name: Install modern Docker CE packages
   ansible.builtin.apt:
     name:
       - docker-ce
@@ -30,46 +45,38 @@
       - docker-buildx-plugin
       - docker-compose-plugin
     state: present
-        update_cache: true
+  become: true
 
-    - name: Ensure Docker service is running and enabled
+- name: Ensure Docker services are running and enabled
   ansible.builtin.service:
     name: docker
     state: started
     enabled: true
-
-- name: Configure deployment user for Docker
   become: true
-  block:
-    - name: Add user to docker group
+
+- 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
     groups: docker
     append: true
+  become: true
 
-    - name: Create target for docker compose
+- name: Create target for docker compose
   ansible.builtin.file:
     path: /opt/docker
     state: directory
     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 user
-      ansible.builtin.user:
-        name: appuser
-        state: present
-        uid: 9999
-        group: appuser
-        system: true
-        shell: /usr/sbin/nologin
-        create_home: false

roles/security/tasks/main.yml

@@ -1,34 +1,32 @@
 ---
-- name: Harden SSH configuration
-  become: true
-  block:
-    - name: Create SSH drop-in directory
+- name: Create SSH drop-in directory
   ansible.builtin.file:
     path: /etc/ssh/sshd_config.d
     state: directory
     owner: root
     group: root
     mode: "0755"
+  become: true
 
-    - name: Harden SSH configuration with drop-in template
+- 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
-
-- name: Enable fail2ban
   become: true
-  block:
-    - name: Install fail2ban
+
+- 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

roles/users/defaults/main.yml

@@ -1,3 +0,0 @@
----
-users_setup_sysadmin: true
-users_setup_deployment: false   # opt-in: enable explicitly to use

roles/users/tasks/deployment.yml

@@ -1,14 +0,0 @@
----
-- name: Create deployment user for CI/CD
-  ansible.builtin.user:
-    name: deployment
-    shell: /bin/bash
-    create_home: yes
-  become: true
-
-- name: Add SSH public key for deployment user
-  ansible.posix.authorized_key:
-    user: deployment
-    state: present
-    key: "{{ deployment_public_ssh_key }}"
-  become: true

roles/users/tasks/main.yml

@@ -1,14 +1,38 @@
 ---
-- name: Configure sysadmin user
-  ansible.builtin.import_tasks: sysadmin.yml
-  when: users_setup_sysadmin | bool
+# - name: Create primary admin user
+#   ansible.builtin.user:
+#     name: sysadmin
+#     groups: sudo
+#     append: yes
+#     shell: /bin/bash
+#     create_home: yes
+#   become: true
 
-- name: Configure deployment user
-  ansible.builtin.import_tasks: deployment.yml
-  when: users_setup_deployment | bool
+# - name: Add SSH public key for sysadmin
+#   ansible.posix.authorized_key:
+#     user: sysadmin
+#     state: present
+#     key: "{{ sysadmin_public_ssh_key }}"
+#   become: true
 
-# opt in to feature flags / tasks with:
-# roles:
-#   - role: studio.ansible.users
-#     vars:
-#       users_setup_deployment: true
+# - name: Allow passwordless sudo to sysadmin user
+#   ansible.builtin.copy:
+#     dest: /etc/sudoers.d/sysadmin
+#     content: "sysadmin ALL=(ALL) NOPASSWD: ALL"
+#     mode: "0440"
+#     validate: /usr/sbin/visudo -cf %s
+#   become: true
+
+- name: Create deployment user for CI/CD
+  ansible.builtin.user:
+    name: deployment
+    shell: /bin/bash
+    create_home: yes
+  become: true
+
+- name: Add SSH public key for deployment user
+  ansible.posix.authorized_key:
+    user: deployment
+    state: present
+    key: "{{ deployment_public_ssh_key }}"
+  become: true

roles/users/tasks/sysadmin.yml

@@ -1,24 +0,0 @@
----
-- name: Create primary 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
-  ansible.posix.authorized_key:
-    user: "{{ sysadmin_user }}"
-    state: present
-    key: "{{ sysadmin_public_ssh_key }}"
-  become: true
-
-- name: Allow passwordless sudo for sudo group
-  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