From c23e8271593a140a9b8d68226c7f5f8ca45b2d64 Mon Sep 17 00:00:00 2001 From: Florian Rey Date: Tue, 17 Sep 2024 11:32:22 +0200 Subject: [PATCH] [All] Mainly buster related fixes --- CHANGELOG.md | 4 ++++ molecule/maxscale.23.02/converge.yml | 4 +++- molecule/maxscale.23.02/prepare.yml | 4 +++- molecule/maxscale.23.08/converge.yml | 16 ++++++++++++---- molecule/maxscale.23.08/prepare.yml | 4 +++- molecule/php.5.6/converge.yml | 16 ++++++++++++---- molecule/php.5.6/prepare.yml | 4 +++- molecule/php.7.0/converge.yml | 4 +++- molecule/php.7.0/prepare.yml | 4 +++- molecule/php.7.1/converge.yml | 4 +++- molecule/php.7.1/prepare.yml | 4 +++- molecule/php.7.2/converge.yml | 4 +++- molecule/php.7.2/prepare.yml | 4 +++- molecule/php.7.3/converge.yml | 4 +++- molecule/php.7.3/prepare.yml | 4 +++- molecule/php.7.4/converge.yml | 16 ++++++++++++---- molecule/php.7.4/prepare.yml | 4 +++- molecule/php.8.0/converge.yml | 4 +++- molecule/php.8.0/prepare.yml | 4 +++- molecule/php.8.1/converge.yml | 4 +++- molecule/php.8.1/prepare.yml | 4 +++- molecule/php.8.2/converge.yml | 4 +++- molecule/php.8.2/prepare.yml | 4 +++- molecule/php.8.3/converge.yml | 16 ++++++++++++---- molecule/php.8.3/prepare.yml | 4 +++- molecule/postgresql.9.4/converge.yml | 1 + roles/apt/vars/main.yaml | 4 ++-- 27 files changed, 115 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 163ef3e1b..609eb112e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] +### Fixed +- [Apt] Fix buster backports/backports_sloppy debian repository uris + ## [4.2.0] - 2024-09-04 ### Added - [Apt] Add HAProxy 3.0 repository diff --git a/molecule/maxscale.23.02/converge.yml b/molecule/maxscale.23.02/converge.yml index e99c09fb7..bc59b3a9d 100644 --- a/molecule/maxscale.23.02/converge.yml +++ b/molecule/maxscale.23.02/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - block: # noqa: name[missing] - name: Role diff --git a/molecule/maxscale.23.02/prepare.yml b/molecule/maxscale.23.02/prepare.yml index 4b36f4bdd..0b118a802 100644 --- a/molecule/maxscale.23.02/prepare.yml +++ b/molecule/maxscale.23.02/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/maxscale.23.08/converge.yml b/molecule/maxscale.23.08/converge.yml index e33fab014..1300d7942 100644 --- a/molecule/maxscale.23.08/converge.yml +++ b/molecule/maxscale.23.08/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - block: # noqa: name[missing] - name: Role @@ -25,7 +27,9 @@ - name: Config tags: [config] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: tests_dir: /molecule/maxscale/config tasks: @@ -65,7 +69,9 @@ - name: Configs tags: [configs] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: tests_dir: /molecule/maxscale/configs tasks: @@ -156,7 +162,9 @@ - name: Users tags: [users] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: tests_dir: /molecule/maxscale/users tasks: diff --git a/molecule/maxscale.23.08/prepare.yml b/molecule/maxscale.23.08/prepare.yml index 321d8f234..cb9b6673a 100644 --- a/molecule/maxscale.23.08/prepare.yml +++ b/molecule/maxscale.23.08/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.5.6/converge.yml b/molecule/php.5.6/converge.yml index 60d567d9f..d9558493b 100644 --- a/molecule/php.5.6/converge.yml +++ b/molecule/php.5.6/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 5.6 tasks: @@ -80,7 +82,9 @@ - name: Exclusive tags: [exclusive] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 5.6 tasks: @@ -122,7 +126,9 @@ - name: Configs tags: [configs] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 5.6 tests_dir: /molecule/php/configs @@ -252,7 +258,9 @@ - name: Fpm Pools tags: [fpm_pools] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 5.6 tests_dir: /molecule/php/fpm_pools diff --git a/molecule/php.5.6/prepare.yml b/molecule/php.5.6/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.5.6/prepare.yml +++ b/molecule/php.5.6/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.7.0/converge.yml b/molecule/php.7.0/converge.yml index dfbbc63f2..d7831a92e 100644 --- a/molecule/php.7.0/converge.yml +++ b/molecule/php.7.0/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.0 tasks: diff --git a/molecule/php.7.0/prepare.yml b/molecule/php.7.0/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.7.0/prepare.yml +++ b/molecule/php.7.0/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.7.1/converge.yml b/molecule/php.7.1/converge.yml index ef8dbbbd0..39a72ce9e 100644 --- a/molecule/php.7.1/converge.yml +++ b/molecule/php.7.1/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.1 tasks: diff --git a/molecule/php.7.1/prepare.yml b/molecule/php.7.1/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.7.1/prepare.yml +++ b/molecule/php.7.1/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.7.2/converge.yml b/molecule/php.7.2/converge.yml index bd743e8fd..2be331a42 100644 --- a/molecule/php.7.2/converge.yml +++ b/molecule/php.7.2/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.2 tasks: diff --git a/molecule/php.7.2/prepare.yml b/molecule/php.7.2/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.7.2/prepare.yml +++ b/molecule/php.7.2/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.7.3/converge.yml b/molecule/php.7.3/converge.yml index bf5dbebd4..64eae7a59 100644 --- a/molecule/php.7.3/converge.yml +++ b/molecule/php.7.3/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.3 tasks: diff --git a/molecule/php.7.3/prepare.yml b/molecule/php.7.3/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.7.3/prepare.yml +++ b/molecule/php.7.3/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.7.4/converge.yml b/molecule/php.7.4/converge.yml index 9591da1e3..fc4e69d1d 100644 --- a/molecule/php.7.4/converge.yml +++ b/molecule/php.7.4/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.4 tasks: @@ -80,7 +82,9 @@ - name: Exclusive tags: [exclusive] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.4 tasks: @@ -122,7 +126,9 @@ - name: Configs tags: [configs] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.4 tests_dir: /molecule/php/configs @@ -252,7 +258,9 @@ - name: Fpm Pools tags: [fpm_pools] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 7.4 tests_dir: /molecule/php/fpm_pools diff --git a/molecule/php.7.4/prepare.yml b/molecule/php.7.4/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.7.4/prepare.yml +++ b/molecule/php.7.4/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.8.0/converge.yml b/molecule/php.8.0/converge.yml index 7c213f5b1..5ec64b376 100644 --- a/molecule/php.8.0/converge.yml +++ b/molecule/php.8.0/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.0 tasks: diff --git a/molecule/php.8.0/prepare.yml b/molecule/php.8.0/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.8.0/prepare.yml +++ b/molecule/php.8.0/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.8.1/converge.yml b/molecule/php.8.1/converge.yml index c34dd669f..035683da6 100644 --- a/molecule/php.8.1/converge.yml +++ b/molecule/php.8.1/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.1 tasks: diff --git a/molecule/php.8.1/prepare.yml b/molecule/php.8.1/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.8.1/prepare.yml +++ b/molecule/php.8.1/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.8.2/converge.yml b/molecule/php.8.2/converge.yml index a8d9c649d..74fad01bb 100644 --- a/molecule/php.8.2/converge.yml +++ b/molecule/php.8.2/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.2 tasks: diff --git a/molecule/php.8.2/prepare.yml b/molecule/php.8.2/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.8.2/prepare.yml +++ b/molecule/php.8.2/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/php.8.3/converge.yml b/molecule/php.8.3/converge.yml index f7a34b9a8..5d9458c64 100644 --- a/molecule/php.8.3/converge.yml +++ b/molecule/php.8.3/converge.yml @@ -6,7 +6,9 @@ - name: Default tags: [default] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.3 tasks: @@ -80,7 +82,9 @@ - name: Exclusive tags: [exclusive] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.3 tasks: @@ -122,7 +126,9 @@ - name: Configs tags: [configs] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.3 tests_dir: /molecule/php/configs @@ -252,7 +258,9 @@ - name: Fpm Pools tags: [fpm_pools] - hosts: debian + hosts: + - debian + - "!debian.buster" vars: manala_php_version: 8.3 tests_dir: /molecule/php/fpm_pools diff --git a/molecule/php.8.3/prepare.yml b/molecule/php.8.3/prepare.yml index 3496da61b..bd2f1f477 100644 --- a/molecule/php.8.3/prepare.yml +++ b/molecule/php.8.3/prepare.yml @@ -2,7 +2,9 @@ - name: Prepare tags: [always] - hosts: debian + hosts: + - debian + - "!debian.buster" tasks: - name: Apt ansible.builtin.import_role: diff --git a/molecule/postgresql.9.4/converge.yml b/molecule/postgresql.9.4/converge.yml index e540fcfe6..775085210 100644 --- a/molecule/postgresql.9.4/converge.yml +++ b/molecule/postgresql.9.4/converge.yml @@ -19,6 +19,7 @@ local all postgres peer # Trust all IPv4 local connections host all all 127.0.0.1/32 trust + host all all ::1/128 trust manala_postgresql_roles: - role: foo password: ~ diff --git a/roles/apt/vars/main.yaml b/roles/apt/vars/main.yaml index 468015753..791f80f8d 100644 --- a/roles/apt/vars/main.yaml +++ b/roles/apt/vars/main.yaml @@ -42,13 +42,13 @@ manala_apt_repositories_patterns: components: "{{ manala_apt_components | flatten | join(' ') }}" legacy_file: deb_debian_org_debian.list backports: - uris: http://deb.debian.org/debian + uris: "{{ (ansible_facts.distribution_release in ['buster']) | ternary('http://archive.debian.org/debian', 'http://deb.debian.org/debian') }}" suites: "{{ ansible_facts.distribution_release }}-backports" components: "{{ manala_apt_components | flatten | join(' ') }}" pin: release n={{ ansible_facts.distribution_release }}-backports legacy_file: deb_debian_org_debian.list backports_sloppy: - uris: http://deb.debian.org/debian + uris: "{{ (ansible_facts.distribution_release in ['buster']) | ternary('http://archive.debian.org/debian', 'http://deb.debian.org/debian') }}" suites: "{{ ansible_facts.distribution_release }}-backports-sloppy" components: "{{ manala_apt_components | flatten | join(' ') }}" pin: release n={{ ansible_facts.distribution_release }}-backports-sloppy