diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 88d8b2c9..a35ab713 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - image: ["debian:bullseye", "debian:bookworm"] + image: ["debian:bullseye", "debian:bookworm", "debian:trixie"] rails_env: [staging, production] container: image: ${{ matrix.image }} diff --git a/README.md b/README.md index 3ec1a0d4..f3c53bc2 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ A remote server with one of the supported distributions: - Ubuntu 24.04 x64 - Debian Bullseye x64 - Debian Bookworm x64 +- Debian Trixie x64 Access to a remote server via public ssh key without password. The default user is `deploy` but you can [use any user](#using-a-different-user-than-deploy) with sudo privileges. @@ -49,7 +50,7 @@ Python 3 installed in the remote server The following commands must be executed in your local machine -[Install Ansible >= 2.7](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) +[Install Ansible >= 6.x](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html) (that is, ansible-core >= 2.13). Get the Ansible Playbook diff --git a/ansible.cfg b/ansible.cfg index 4a564084..935c60ff 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,4 @@ [defaults] -# Use the YAML callback plugin. -stdout_callback = yaml +callback_result_format=yaml allow_world_readable_tmpfiles = true interpreter_python = auto diff --git a/group_vars/all b/group_vars/all index 62529264..46281dee 100644 --- a/group_vars/all +++ b/group_vars/all @@ -62,6 +62,7 @@ fnm_command: "export PATH=\"{{ fnm_dir }}/:$PATH\" && eval \"$(fnm env)\"" # RVM rvm_command: "source {{ home_dir }}/.rvm/scripts/rvm" rvm1_delete_ruby: False +rvm1_ruby_install_flags: "" # Errbit errbit: False diff --git a/roles/letsencrypt/tasks/main.yml b/roles/letsencrypt/tasks/main.yml index 4b651442..ebffff5b 100644 --- a/roles/letsencrypt/tasks/main.yml +++ b/roles/letsencrypt/tasks/main.yml @@ -1,10 +1,6 @@ --- - when: domain is defined block: - - name: Install software-properties-common - apt: - name: software-properties-common - - name: Check python3-certbot-nginx is available command: apt-cache show python3-certbot-nginx ignore_errors: yes diff --git a/roles/system/tasks/tools.yml b/roles/system/tasks/tools.yml index 1997236a..f57e56d7 100644 --- a/roles/system/tasks/tools.yml +++ b/roles/system/tasks/tools.yml @@ -10,6 +10,7 @@ - vim - htop - git-core + - gpg - wget - zlib1g-dev - libssl-dev @@ -24,4 +25,22 @@ - imagemagick - ruby-dev - shared-mime-info + +- name: Install policykit-1 + become: true + apt: + state: latest + update_cache: true + name: - policykit-1 + when: ansible_distribution_release in ["bullseye"] + +- name: Install polkitd and pkexec + become: true + apt: + state: latest + update_cache: true + name: + - polkitd + - pkexec + when: ansible_distribution_release not in ["bullseye"] diff --git a/roles/user/tasks/main.yml b/roles/user/tasks/main.yml index 220a9fa8..75db6d91 100644 --- a/roles/user/tasks/main.yml +++ b/roles/user/tasks/main.yml @@ -29,4 +29,4 @@ - name: Install SSH key authorized_key: user: "{{ deploy_user }}" - key: "{{ lookup('file', '{{ ssh_public_key_path }}') }}" + key: "{{ lookup('file', ssh_public_key_path) }}"