From fec5f67faec1e4acc9e055bc062940a7fd335d9f 2024-02-10 21:36:09 From: Branko Majic Date: 2024-02-10 21:36:09 Subject: [PATCH] MAR-191: Drop support for Debian 10 Buster from the wsgi_website role. --- diff --git a/docs/rolereference.rst b/docs/rolereference.rst index d80ddd9625141f7ded455a47f7560c73bea66765..0a52b9ed9cc80caa4821770977f3945de501d28d 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -1014,7 +1014,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 10 (Buster) - Debian 11 (Bullseye) diff --git a/roles/xmpp_server/meta/main.yml b/roles/xmpp_server/meta/main.yml index 55617dac759f1a580e63114ba1245758e82ce01c..3ea41c50efcd2d0ef82ce7b207866015e8102fbe 100644 --- a/roles/xmpp_server/meta/main.yml +++ b/roles/xmpp_server/meta/main.yml @@ -16,5 +16,4 @@ galaxy_info: platforms: - name: Debian versions: - - 10 - 11 diff --git a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml index 278d65ae58e744af50a68f00d56fcae0b1f09eb9..9acb1cc465386403e88a8d249c8244ed13c860ea 100644 --- a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml +++ b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml @@ -39,9 +39,6 @@ backup_host_ssh_private_keys: ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" backup_clients: - - server: parameters-optional-buster - ip: 192.168.56.32 - public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}" - server: parameters-optional-bullseye ip: 192.168.56.42 public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}" diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml index 51ac836f1e34847abbf0b4833e77d0690ca114b0..f9c34f3894953a44d9a31722fc798f807ac71a22 100644 --- a/roles/xmpp_server/molecule/default/molecule.yml +++ b/roles/xmpp_server/molecule/default/molecule.yml @@ -26,21 +26,6 @@ platforms: network_name: private_network type: static - - name: client-buster - groups: - - clients - - buster - box: debian/contrib-buster64 - memory: 256 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.21 - network_name: private_network - type: static - - name: client-bullseye groups: - clients @@ -56,36 +41,6 @@ platforms: network_name: private_network type: static - - name: parameters-mandatory-buster - groups: - - parameters-mandatory - - buster - box: debian/contrib-buster64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.31 - network_name: private_network - type: static - - - name: parameters-optional-buster - groups: - - parameters-optional - - buster - box: debian/contrib-buster64 - memory: 512 - cpus: 1 - provider_raw_config_args: - - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']" - interfaces: - - auto_config: true - ip: 192.168.56.32 - network_name: private_network - type: static - - name: parameters-mandatory-bullseye groups: - parameters-mandatory diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml index 07ddb70c3d7a1740b2bc6da05157d14f092740c6..3d61d4ddfc8793087e93803847836ac4e34d41b8 100644 --- a/roles/xmpp_server/molecule/default/prepare.yml +++ b/roles/xmpp_server/molecule/default/prepare.yml @@ -23,22 +23,6 @@ fqdn: - ldap-server - - name: parameters-mandatory-buster_xmpp - fqdn: - - parameters-mandatory - - domain1 - - proxy.domain1 - - conference.domain1 - - name: parameters-optional-buster_xmpp - fqdn: - - parameters-optional - - domain2 - - proxy.domain2 - - conference.domain2 - - domain3 - - proxy.domain3 - - conference.domain3 - - name: parameters-mandatory-bullseye_xmpp fqdn: - parameters-mandatory @@ -102,25 +86,6 @@ mode: 0644 state: present -- hosts: buster - become: true - tasks: - - - name: Set-up the hosts file - lineinfile: - path: /etc/hosts - regexp: "^{{ item.key }}" - line: "{{ item.key }} {{ item.value }}" - owner: root - group: root - mode: 0644 - state: present - with_dict: - 192.168.56.11: "ldap-server backup-server" - 192.168.56.21: "client-buster" - 192.168.56.31: "parameters-mandatory domain1 proxy.domain1 conference.domain1" - 192.168.56.32: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3" - - hosts: bullseye become: true tasks: diff --git a/roles/xmpp_server/molecule/default/tests/test_default_buster.py b/roles/xmpp_server/molecule/default/tests/test_default_buster.py deleted file mode 100644 index 1bdc60375e2006ae7e22b5202c37d7e7fe10088c..0000000000000000000000000000000000000000 --- a/roles/xmpp_server/molecule/default/tests/test_default_buster.py +++ /dev/null @@ -1,28 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('parameters-*-buster') - - -def test_backports_prosody_pinning(host): - """ - Tests if the backports pin for Prosody has been deployed correctly. - """ - - pin = host.file("/etc/apt/preferences.d/prosody") - - assert pin.is_file - assert pin.user == "root" - assert pin.group == "root" - assert pin.mode == 0o644 - - prosody_package = host.package("prosody") - prosody_modules_package = host.package("prosody-modules") - lua_ldap_package = host.package("lua-sec") - - assert "bpo" in prosody_package.version - assert "bpo" in prosody_modules_package.version - assert "bpo" in lua_ldap_package.version diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml index 0055de61e94d3c451b32d5c409addefa54b25d98..a41e15e68dd1321b18d9dae1931467bf7fd5e847 100644 --- a/roles/xmpp_server/tasks/main.yml +++ b/roles/xmpp_server/tasks/main.yml @@ -22,15 +22,6 @@ update_cache: true when: backports_repository_configuration.changed -- name: Configure package pins to backports for Prosody on Debian 10 Buster - template: - src: prosody_backports_pin.j2 - dest: /etc/apt/preferences.d/prosody - owner: root - group: root - mode: 0644 - when: ansible_distribution_release == 'buster' - - name: Drop package pins to backports for Prosody on Debian 11 Bullseye file: path: /etc/apt/preferences.d/prosody