From e150a3306d2650239820307b0b3bfa4ae0595ba3 Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 4 Nov 2025 20:27:20 +0100 Subject: [PATCH] =?UTF-8?q?chore=20=F0=9F=93=A6:=20Update=20Samba=20packag?= =?UTF-8?q?e=20installation=20to=20use=20modern=20methods?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated the Ansible playbook to use modern methods for adding the Samba Team Debian GPG key and repository, making it easier to upgrade to a newer version of Samba. This change also includes updating the APT cache when an upgrade is needed. --- tasks/install.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tasks/install.yml b/tasks/install.yml index 6beaa9e..5734ce3 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -37,19 +37,33 @@ msg: "⚠️ Detected buggy Samba version 4.22.4 — upgrade recommended!" when: "'4.22.4' in samba_version.stdout" -- name: Add Samba Team Debian GPG key (only if upgrade is needed) - ansible.builtin.apt_key: +- name: Add Samba Team Debian GPG key (modern method) + ansible.builtin.get_url: url: https://pkg.samba.org/keys/samba-pubkey.asc - state: present + dest: /usr/share/keyrings/samba-team-archive-keyring.gpg + mode: '0644' when: "'4.22.4' in samba_version.stdout" -- name: Add Samba Team Debian repository (only if upgrade is needed) +- name: Add Samba Team Debian repository (modern method) ansible.builtin.apt_repository: - repo: "deb http://pkg.samba.org/packages/debian $(lsb_release -cs) samba-422" + repo: "deb [signed-by=/usr/share/keyrings/samba-team-archive-keyring.gpg] http://pkg.samba.org/packages/debian {{ ansible_lsb.codename | default('bookworm') }} samba-422" state: present filename: samba-team when: "'4.22.4' in samba_version.stdout" +# - name: Add Samba Team Debian GPG key (only if upgrade is needed) +# ansible.builtin.apt_key: +# url: https://pkg.samba.org/keys/samba-pubkey.asc +# state: present +# when: "'4.22.4' in samba_version.stdout" + +# - name: Add Samba Team Debian repository (only if upgrade is needed) +# ansible.builtin.apt_repository: +# repo: "deb http://pkg.samba.org/packages/debian $(lsb_release -cs) samba-422" +# state: present +# filename: samba-team +# when: "'4.22.4' in samba_version.stdout" + - name: Update APT cache (only if upgrade is needed) ansible.builtin.apt: update_cache: yes