diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b19f4d0..38b1cb9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * apt: disable `NonFreeFirmware` warning for VM on Debian 12+ * apt: explicit `signed-by` directives for official sources * bind: add reload-zone helper +* certbot: deploy-hook for proftpd * docker-host: added var for user namespace setting * dovecot: add Munin plugins dovecot1 and dovecot_stats (patched) * dovecot: fix old_stats plugin for Dovecot 2.3 @@ -51,7 +52,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * mysql: improve shell syntax for mysql_skip script * nagios-nrpe: set default check_load --per-cpu for BSD * pgbouncer: minor fixes -* postfix (packmail or when postfix_slow_transport_include is True): change `minimal_backoff_time` from 2h to 15m (see HowtoPostfix) +* postfix (packmail or when postfix_slow_transport_include is True): change `miniprofmal_backoff_time` from 2h to 15m (see HowtoPostfix) * postfix (packmail) : optimize Amavis integration * postfix: disable sending mails via IPv6 * postfix: new spam.sh update script that avoids reloading if files did not change. @@ -67,6 +68,7 @@ The **patch** part changes is incremented if multiple releases happen the same m * evolinux-base, evolinux-users: Fix files mode under `/etc/ssh/sshd_config.d` * evolinux-base: fix file extension * fail2ban: fix cron `fail2ban_dbpurge` (should be bash instead of sh) +* lxc-php: fix APT keyring path inside containers * nagios-nrpe: `check_ssl_local` now has an output that nrpe can understand when it isn't OK * nagios-nrpe: remount `/usr` **after** installing the packages * nginx: set default server directive in default vhost diff --git a/lxc-php/tasks/php80.yml b/lxc-php/tasks/php80.yml index 0329d8b5..66f51f6f 100644 --- a/lxc-php/tasks/php80.yml +++ b/lxc-php/tasks/php80.yml @@ -27,9 +27,9 @@ - "deb [signed-by={{ lxc_apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main" - "deb [signed-by={{ lxc_apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php80 main" -- name: "Ensure {{ lxc_rootfs }}{{ apt_keyring_dir }} directory exists" +- name: "Ensure {{ lxc_rootfs }}{{ lxc_apt_keyring_dir }} directory exists" file: - path: "{{ lxc_rootfs }}{{ apt_keyring_dir }}" + path: "{{ lxc_rootfs }}{{ lxc_apt_keyring_dir }}" state: directory mode: "755" owner: root diff --git a/lxc-php/tasks/php81.yml b/lxc-php/tasks/php81.yml index 67b50a28..0b92c3de 100644 --- a/lxc-php/tasks/php81.yml +++ b/lxc-php/tasks/php81.yml @@ -26,9 +26,9 @@ - "deb [signed-by={{ lxc_apt_keyring_dir }}/sury.gpg] https://packages.sury.org/php/ bullseye main" - "deb [signed-by={{ lxc_apt_keyring_dir }}/pub_evolix.asc] http://pub.evolix.org/evolix bullseye-php81 main" -- name: "Ensure {{ lxc_rootfs }}{{ apt_keyring_dir }} directory exists" +- name: "Ensure {{ lxc_rootfs }}{{ lxc_apt_keyring_dir }} directory exists" file: - path: "{{ lxc_rootfs }}{{ apt_keyring_dir }}" + path: "{{ lxc_rootfs }}{{ lxc_apt_keyring_dir }}" state: directory mode: "755" owner: root diff --git a/lxc-php/tasks/php82.yml b/lxc-php/tasks/php82.yml index f8fe2f33..ede18853 100644 --- a/lxc-php/tasks/php82.yml +++ b/lxc-php/tasks/php82.yml @@ -28,9 +28,9 @@ force: true mode: "0644" -- name: "Ensure {{ lxc_rootfs }}{{ apt_keyring_dir }} directory exists" +- name: "Ensure {{ lxc_rootfs }}{{ lxc_apt_keyring_dir }} directory exists" file: - path: "{{ lxc_rootfs }}{{ apt_keyring_dir }}" + path: "{{ lxc_rootfs }}{{ lxc_apt_keyring_dir }}" state: directory mode: "755" owner: root diff --git a/lxc-php/templates/sury.sources.j2 b/lxc-php/templates/sury.sources.j2 index 7d8a95c5..22725a58 100644 --- a/lxc-php/templates/sury.sources.j2 +++ b/lxc-php/templates/sury.sources.j2 @@ -4,5 +4,5 @@ Types: deb URIs: https://packages.sury.org/php/ Suites: {{ ansible_distribution_release }} Components: main -Signed-by: {{ apt_keyring_dir }}/sury.gpg +Signed-by: {{ lxc_apt_keyring_dir }}/sury.gpg Enabled: yes \ No newline at end of file