diff --git a/docs/rolereference.rst b/docs/rolereference.rst index f29924fd837df928e4c043a36347ce26a7fe0475..212739caebb0ef37bf81facd1720a25a53e05002 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -2379,7 +2379,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 10 (Buster) - Debian 11 (Bullseye) diff --git a/roles/backup_client/defaults/main.yml b/roles/backup_client/defaults/main.yml index 3c30b0bdb095bbc8b23f36e2a7127ed435d3f751..350a361d734f23639f116d51064070e3d7cf0ff9 100644 --- a/roles/backup_client/defaults/main.yml +++ b/roles/backup_client/defaults/main.yml @@ -4,8 +4,3 @@ backup_additional_encryption_keys: [] backup_client_username: "bak-{{ ansible_fqdn | replace('.', '_') }}" backup_server_destination: /duplicity backup_server_port: 2222 - -# Internal parameters. -backup_client_pexpect_package: - buster: python-pexpect - bullseye: python3-pexpect diff --git a/roles/backup_client/meta/main.yml b/roles/backup_client/meta/main.yml index ddcbbe23400369c0ff25041f2fd87e5369914dc9..3a4f09d122c149a92ea6d49d1f1ca1c773c05a4d 100644 --- a/roles/backup_client/meta/main.yml +++ b/roles/backup_client/meta/main.yml @@ -8,5 +8,4 @@ galaxy_info: platforms: - name: Debian versions: - - 10 - 11 diff --git a/roles/backup_client/molecule/default/molecule.yml b/roles/backup_client/molecule/default/molecule.yml index 23c70f7e2d8ff4c4c31dd4e27d89b7256c81e75b..c186bd1dd28958d9db67cc12e02472823548c66b 100644 --- a/roles/backup_client/molecule/default/molecule.yml +++ b/roles/backup_client/molecule/default/molecule.yml @@ -29,34 +29,6 @@ platforms: network_name: private_network type: static - - name: param-mandatory-buster - groups: - - parameters-mandatory - 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.20 - network_name: private_network - type: static - - - name: param-optional-buster - groups: - - parameters-optional - 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: param-mandatory-bullseye groups: - parameters-mandatory diff --git a/roles/backup_client/molecule/default/prepare.yml b/roles/backup_client/molecule/default/prepare.yml index c779fe1fd9523abe1f8210e29f3dfdba4a66c0fa..51590dcd8b949bc0ae7cac593f6326e548e7c554 100644 --- a/roles/backup_client/molecule/default/prepare.yml +++ b/roles/backup_client/molecule/default/prepare.yml @@ -45,7 +45,7 @@ - /etc/ssh/ssh_host_ed25519_key.pub - /etc/ssh/ssh_host_ecdsa_key.pub - - name: Force the use of internal-sftp subsystem fro SFTP + - name: Force the use of internal-sftp subsystem for SFTP lineinfile: path: /etc/ssh/sshd_config regexp: "^Subsystem.*sftp" @@ -94,15 +94,12 @@ - name: Change ownership of home directories for SFTP chroot to work file: - path: "{{ item }}" + path: "/home/{{ item.name }}" state: directory owner: root group: root mode: 0755 - with_items: - - /home/backupuser - - /home/bak-param-mandatory-buster - - /home/bak-param-mandatory-bullseye + with_items: "{{ backup_users }}" - name: Set-up duplicity backup directories file: @@ -113,17 +110,6 @@ mode: 0770 with_items: "{{ backup_users }}" - - - name: Set-up directories for parameters-optional backups - file: - path: "~backupuser/duplicity/{{ item }}" - state: directory - owner: backupuser - group: backupuser - mode: 0700 - with_items: - - "param-optional-buster" - handlers: - name: Restart ssh service: @@ -132,8 +118,6 @@ vars: backup_users: - - name: bak-param-mandatory-buster - key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}" - name: bak-param-mandatory-bullseye key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}" - name: backupuser diff --git a/roles/backup_client/molecule/default/tests/test_default.py b/roles/backup_client/molecule/default/tests/test_default.py index 4e867af66c3d6c19e4e01c38f347f860c2f4dea3..0bc080eb3359f2f4a5bd129d12ec3dbb70db1751 100644 --- a/roles/backup_client/molecule/default/tests/test_default.py +++ b/roles/backup_client/molecule/default/tests/test_default.py @@ -14,10 +14,7 @@ def test_installed_packages(host): distribution_release = host.ansible("setup")["ansible_facts"]["ansible_distribution_release"] - if distribution_release == "buster": - expected_package_name = "python-pexpect" - else: - expected_package_name = "python3-pexpect" + expected_package_name = "python3-pexpect" assert host.package(expected_package_name).is_installed assert host.package('duply').is_installed diff --git a/roles/backup_client/tasks/main.yml b/roles/backup_client/tasks/main.yml index 5bfe3f6fd2d383227fc975711e8eead1290c3088..722030b77f096a660cb643e37c238a7c19624c3d 100644 --- a/roles/backup_client/tasks/main.yml +++ b/roles/backup_client/tasks/main.yml @@ -5,7 +5,7 @@ # possible to switch to Paramiko backend. - name: Install pexpect for pexpect+sftp Duplicity backend apt: - name: "{{ backup_client_pexpect_package[ansible_distribution_release] }}" + name: python3-pexpect state: present - name: Install backup software