fix: directory traversal permission

remove validation step instead of running pointless validation on static template

meta/runtime.yml

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

roles/base/tasks/main.yml

@@ -35,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/coolify/defaults/main.yml

@@ -0,0 +1,16 @@
+---
+coolify_installer_url: "https://cdn.coollabs.io/coolify/install.sh"
+coolify_installer_dest: "/tmp/coolify-install.sh"
+coolify_data_dir: "/data/coolify"
+coolify_compose_file: "{{ coolify_data_dir }}/source/docker-compose.yml"
+
+## Pin to a release or leave empty for latest
+coolify_version: ""
+
+## Set to false to manage upgrades manually
+coolify_autoupdate: true
+
+## All 3 needed for sucessful user creation
+coolify_root_username: ""
+coolify_root_user_email: ""
+coolify_root_user_password: ""

roles/coolify/tasks/main.yml

@@ -0,0 +1,30 @@
+---
+- name: Check if Coolify is already installed
+  become: true
+  ansible.builtin.stat:
+    path: "{{ coolify_compose_file }}"
+  register: coolify_installed
+
+- name: Download Coolify installer
+  ansible.builtin.get_url:
+    url: "{{ coolify_installer_url }}"
+    dest: "{{ coolify_installer_dest }}"
+    mode: "0755"
+  when: not coolify_installed.stat.exists
+
+- name: Run Coolify installer
+  become: true
+  ansible.builtin.command:
+    argv:
+      - "{{ coolify_installer_dest }}"
+      - "{{ coolify_version }}"
+  environment:
+    AUTOUPDATE: "{{ coolify_autoupdate | bool | ternary('true', 'false') }}"
+    ROOT_USERNAME: "{{ coolify_root_username }}"
+    ROOT_USER_EMAIL: "{{ coolify_root_user_email }}"
+    ROOT_USER_PASSWORD: "{{ coolify_root_user_password }}"
+  when: not coolify_installed.stat.exists
+  changed_when: true
+  async: 1800
+  poll: 15
+  no_log: true

roles/docker/tasks/main.yml

@@ -1,82 +1,76 @@
 ---
-- name: Install Docker prerequisites
-  ansible.builtin.apt:
-    name:
-      - ca-certificates
-      - curl
-    state: present
-    update_cache: true
+- name: Install Docker
   become: true
+  block:
+    - name: Install Docker prerequisites
+      ansible.builtin.apt:
+        name:
+          - ca-certificates
+          - curl
+          - python3-debian ## needed for the deb822 module
+        state: present
+        update_cache: true
 
-- name: Ensure APT keyrings directory exists
-  ansible.builtin.file:
-    path: /etc/apt/keyrings
-    state: directory
-    mode: "0755"
-  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"
+        state: present
 
-- 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: 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: Get system architecture
-  ansible.builtin.command: dpkg --print-architecture
-  register: dpkg_architecture
-  changed_when: false
-  become: true
+    - name: Ensure Docker service is running and enabled
+      ansible.builtin.service:
+        name: docker
+        state: started
+        enabled: 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
+- 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
 
-- name: Install modern Docker CE packages
-  ansible.builtin.apt:
-    name:
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
-      - docker-buildx-plugin
-      - docker-compose-plugin
-    state: present
-  become: true
+    - name: Create target for docker compose
+      ansible.builtin.file:
+        path: /opt/docker
+        state: directory
+        owner: deployment
+        group: deployment
+        mode: "0755"
 
-- name: Ensure Docker services are running and enabled
-  ansible.builtin.service:
-    name: docker
-    state: started
-    enabled: true
+- 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 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
-  ansible.builtin.file:
-    path: /opt/docker
-    state: directory
-    owner: deployment
-    group: deployment
-    mode: "0755"
-  become: true
+    - 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/tasks/main.yml

@@ -1,33 +1,35 @@
 ---
-- name: Create SSH drop-in directory
-  ansible.builtin.file:
-    path: /etc/ssh/sshd_config.d
-    state: directory
-    owner: root
-    group: root
-    mode: "0755"
+- name: Harden SSH configuration
   become: true
+  block:
+    - name: Create SSH drop-in directory
+      ansible.builtin.file:
+        path: /etc/ssh/sshd_config.d
+        state: directory
+        owner: root
+        group: root
+        mode: "0755"
 
-- 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: 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"
+      notify: Restart sshd
+
+- name: Enable fail2ban
   become: true
+  block:
+    - name: Install fail2ban
+      ansible.builtin.apt:
+        name:
+          - fail2ban
+        state: present
 
-- name: Install fail2ban
-  ansible.builtin.apt:
-    name:
-      - fail2ban
-    state: present
-  become: true
-
-- name: Start fail2ban
-  ansible.builtin.service:
-    name: fail2ban
-    state: started
-    enabled: yes
+    - name: Start fail2ban
+      ansible.builtin.service:
+        name: fail2ban
+        state: started
+        enabled: yes

roles/users/tasks/main.yml

@@ -1,38 +1,42 @@
 ---
-# - name: Create primary admin user
-#   ansible.builtin.user:
-#     name: sysadmin
-#     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
-#     state: present
-#     key: "{{ sysadmin_public_ssh_key }}"
-#   become: 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
+- 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
 
-- name: Add SSH public key for deployment user
-  ansible.posix.authorized_key:
-    user: deployment
-    state: present
-    key: "{{ deployment_public_ssh_key }}"
+    - name: Add SSH public key
+      ansible.posix.authorized_key:
+        user: "{{ sysadmin_user }}"
+        state: present
+        key: "{{ sysadmin_public_ssh_key }}"
+
+    - 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
+
+
+- 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
+
+    - name: Add SSH public key
+      ansible.posix.authorized_key:
+        user: deployment
+        state: present
+        key: "{{ deployment_public_ssh_key }}"