diff --git a/roles/common/vars/Debian-13.yml b/roles/common/vars/Debian-13.yml new file mode 100644 index 0000000..0504827 --- /dev/null +++ b/roles/common/vars/Debian-13.yml @@ -0,0 +1,11 @@ +--- + +system_distro_utils: + - apt-transport-https + - openssh-client + - netcat-openbsd + - xz-utils + - liblz4-tool + - sshfs + - zstd + - cron diff --git a/roles/consul_bin/defaults/main.yml b/roles/consul_bin/defaults/main.yml index bacf3e2..4d85bdb 100644 --- a/roles/consul_bin/defaults/main.yml +++ b/roles/consul_bin/defaults/main.yml @@ -1,8 +1,8 @@ --- # Version of consul to deploy -consul_version: 1.21.3 +consul_version: 1.21.4 # URL from where the consul archive will be downloaded consul_archive_url: https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip # Expected sha256 of the archive -consul_archive_sha256: ba20631037a5f63f70b0351c0875887a66c0a0d3feac2d255a768c9eb8c95e8b +consul_archive_sha256: a641502dc2bd28e1ed72d3d48a0e8b98c83104d827cf33bee2aed198c0b849df diff --git a/roles/ldap2pg/tasks/facts.yml b/roles/ldap2pg/tasks/facts.yml index 0bd7738..d8adf75 100644 --- a/roles/ldap2pg/tasks/facts.yml +++ b/roles/ldap2pg/tasks/facts.yml @@ -10,7 +10,7 @@ tags: pg - name: Check installed version - shell: ldap2pg -V | head -1 | sed -E 's/ldap2pg v(\d+)/\1/' + shell: ldap2pg -V | head -1 | perl -pe 's/ldap2pg v?(\d+(\.\d+)*)/$1/' register: ldap2pg_current_version when: ldap2pg_bin.stat.exists changed_when: False diff --git a/roles/letsencrypt/vars/Debian-13.yml b/roles/letsencrypt/vars/Debian-13.yml new file mode 100644 index 0000000..17d3cc8 --- /dev/null +++ b/roles/letsencrypt/vars/Debian-13.yml @@ -0,0 +1,6 @@ +--- + +letsencrypt_packages: + - python3-pip + - python3-setuptools + - curl diff --git a/roles/nomad_bin/defaults/main.yml b/roles/nomad_bin/defaults/main.yml index 17b961d..c1159e5 100644 --- a/roles/nomad_bin/defaults/main.yml +++ b/roles/nomad_bin/defaults/main.yml @@ -1,9 +1,9 @@ --- # Version of Nomad to install -nomad_version: 1.10.3 +nomad_version: 1.10.4 # URL of the archive nomad_archive_url: https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.zip # Expected sha256 of the archive -nomad_archive_sha256: a161b8d59b42555d97d37f7a75c122831be485e89dfb97d16d6b60cfaec8d88b +nomad_archive_sha256: 33f50ef9a56ceb995768a1301c7bc73d9270fd751378de5b3cffcf21af9112a2 diff --git a/roles/ntp_client/vars/Debian-13.yml b/roles/ntp_client/vars/Debian-13.yml new file mode 100644 index 0000000..1f3c307 --- /dev/null +++ b/roles/ntp_client/vars/Debian-13.yml @@ -0,0 +1,6 @@ +--- + +ntp_ntpd_service: ntp +ntp_chrony_service: chrony +ntp_chrony_conf: /etc/chrony/chrony.conf +ntp_chrony_keyfile: /etc/chrony/chrony.keys diff --git a/roles/pmg/files/remove_nag.patch b/roles/pmg/files/remove_nag.patch index e9a8257..b7b0bf4 100644 --- a/roles/pmg/files/remove_nag.patch +++ b/roles/pmg/files/remove_nag.patch @@ -1,12 +1,16 @@ ---- /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js.orig 2022-09-23 20:10:20.125559720 +0200 -+++ /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2022-09-23 20:13:04.311301761 +0200 -@@ -510,8 +510,7 @@ - }, - success: function(response, opts) { - let res = response.result; -- if (res === null || res === undefined || !res || res -- .data.status.toLowerCase() !== 'active') { -+ if (false) { - Ext.Msg.show({ - title: gettext('No valid subscription'), - icon: Ext.Msg.WARNING, +--- /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js.orig 2025-08-14 15:58:53.942358475 +0200 ++++ /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js 2025-08-14 15:59:17.487663267 +0200 +@@ -608,12 +608,7 @@ + }, + success: function (response, opts) { + let res = response.result; +- if ( +- res === null || +- res === undefined || +- !res || +- res.data.status.toLowerCase() !== 'active' +- ) { ++ if (false) { + Ext.Msg.show({ + title: gettext('No valid subscription'), + icon: Ext.Msg.WARNING, diff --git a/roles/pmg/tasks/main.yml b/roles/pmg/tasks/main.yml index b2498ef..62ef604 100644 --- a/roles/pmg/tasks/main.yml +++ b/roles/pmg/tasks/main.yml @@ -9,9 +9,9 @@ tags: pmg - name: Add PMG repository APT key - apt_key: + get_url: url: http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg - state: present + dest: /etc/apt/trusted.gpg.d/proxmox.gpg environment: - http_proxy: "{{ system_proxy | default('') }}" tags: pmg diff --git a/roles/repo_pbs/tasks/main.yml b/roles/repo_pbs/tasks/main.yml index 2c979e2..edd0b0b 100644 --- a/roles/repo_pbs/tasks/main.yml +++ b/roles/repo_pbs/tasks/main.yml @@ -1,8 +1,9 @@ --- - name: Add PBS repo key - apt_key: + get_url: url: https://enterprise.proxmox.com/debian/proxmox-{{ ansible_distribution_major_version is version('11', '>=') | ternary('release-' ~ ansible_distribution_release, 've-release-6.x.gpg') }}.gpg + dest: /etc/apt/trusted.gpg.d/proxmox.gpg environment: https_proxy: "{{ system_proxy | default('') }}" tags: repo diff --git a/roles/repo_vector/tasks/Debian.yml b/roles/repo_vector/tasks/Debian.yml index 1126afe..a05619f 100644 --- a/roles/repo_vector/tasks/Debian.yml +++ b/roles/repo_vector/tasks/Debian.yml @@ -1,19 +1,22 @@ --- - name: Add Vector repo key - apt_key: - url: "{{ item }}" + get_url: + url: https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public + dest: /etc/apt/keyrings/datadog.public environment: https_proxy: "{{ system_proxy | default('') }}" - loop: - - https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public - - https://keys.datadoghq.com/DATADOG_APT_KEY_C0962C7D.public - - https://keys.datadoghq.com/DATADOG_APT_KEY_F14F620E.public + register: vector_key + tags: repo,log,vector + +- name: Dearmor datadog key + shell: cat /etc/apt/keyrings/datadog.public | gpg --batch --dearmor > /etc/apt/keyrings/datadog.gpg + changed_when: vector_key.changed tags: repo,log,vector - name: Add Vector repo apt_repository: - repo: deb https://apt.vector.dev/ stable vector-0 + repo: deb [signed-by=/etc/apt/keyrings/datadog.gpg] https://apt.vector.dev/ stable vector-0 filename: vector environment: https_proxy: "{{ system_proxy | default('') }}" diff --git a/roles/repo_zabbix/tasks/Debian.yml b/roles/repo_zabbix/tasks/Debian.yml index ad2b996..475bc17 100644 --- a/roles/repo_zabbix/tasks/Debian.yml +++ b/roles/repo_zabbix/tasks/Debian.yml @@ -9,18 +9,16 @@ tags: repo,zabbix - name: Add Zabbix repo key - apt_key: - url: "{{ item }}" + get_url: + url: https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg + dest: /etc/apt/keyrings/zabbix.gpg environment: https_proxy: "{{ system_proxy | default('') }}" - loop: - - https://repo.zabbix.com/zabbix-official-repo-apr2024.gpg - - https://repo.zabbix.com/zabbix-official-repo.key tags: repo,zabbix - name: Add Zabbix repo apt_repository: - repo: deb https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}{% if zabbix_major_version is version('7.2', '>=') %}/stable{% endif %}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main + repo: deb [signed-by=/etc/apt/keyrings/zabbix.gpg] https://repo.zabbix.com/zabbix/{{ zabbix_major_version }}{% if zabbix_major_version is version('7.2', '>=') %}/stable{% endif %}/{{ ansible_distribution | lower }} {{ (ansible_distribution_major_version is version('13', '>=')) | ternary('bookworm', ansible_distribution_release) }} main filename: zabbix tags: repo,zabbix diff --git a/roles/zabbix_agent/vars/Debian-13.yml b/roles/zabbix_agent/vars/Debian-13.yml new file mode 100644 index 0000000..8157f56 --- /dev/null +++ b/roles/zabbix_agent/vars/Debian-13.yml @@ -0,0 +1,14 @@ +--- + +zabbix_agent_packages: + - openssl + - git + - libconfig-simple-perl + - libjson-perl + - libfile-which-perl + - smartmontools + - lm-sensors + - patch + - fping + - libstatistics-descriptive-perl + - libtimedate-perl