From cd0056b93cda35d85a80b9cbea6fcc79f56434f3 2020-05-15 15:56:34 From: Branko Majic Date: 2020-05-15 15:56:34 Subject: [PATCH] MAR-156: Drop use of DSA keys from all backup-related roles. Includes updates to tests for other roles as well. --- diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 4fee8ea277a6c7a9f5daec19b2e6ad5493136377..935dd195ac3e4c87808b19a6c131afcbc333e17e 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -2141,7 +2141,6 @@ Parameters generated using the appropriate algorithm. Keys for this purpose can be easily created via commands:: - ssh-keygen -f backup_server_dsa_key -N '' -t dsa ssh-keygen -f backup_server_rsa_key -N '' -t rsa ssh-keygen -f backup_server_ed25519_key -N '' -t ed25519 ssh-keygen -f backup_server_ecdsa_key -N '' -t ecdsa @@ -2172,7 +2171,6 @@ Here is an example configuration for setting-up the backup server role: public_key: "{{ lookup('file', inventory_dir + '/ssh/mail.example.com.pub') }}" ip: 10.32.64.15 backup_host_ssh_private_keys: - dsa: "{{ lookup('file', inventory_dir + '/ssh/backup_server_dsa_key') }}" rsa: "{{ lookup('file', inventory_dir + '/ssh/backup_server_rsa_key') }}" ed25519: "{{ lookup('file', inventory_dir + '/ssh/backup_server_ed25519_key') }}" ecdsa: "{{ lookup('file', inventory_dir + '/ssh/backup_server_ecdsa_key') }}" @@ -2299,7 +2297,6 @@ plugin is quite useful here for fetching key values from some local directory): backup_server: "backup.example.com" backup_server_destination: "//example/host" backup_server_host_ssh_public_keys: - - "{{ lookup('file', inventory_dir + '/ssh/backup_server_dsa_key.pub') }}" - "{{ lookup('file', inventory_dir + '/ssh/backup_server_ecdsa_key.pub') }}" - "{{ lookup('file', inventory_dir + '/ssh/backup_server_ed25519_key.pub') }}" - "{{ lookup('file', inventory_dir + '/ssh/backup_server_rsa_key.pub') }}" diff --git a/docs/usage.rst b/docs/usage.rst index 684230e7fd6074b5e0c07c449d77507142f79677..ac2bfb467e591f0f78f741141e3550b1021d9c49 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -2098,7 +2098,6 @@ straight to it: --- backup_host_ssh_private_keys: - dsa: "{{ lookup('file', inventory_dir + '/ssh/bak_dsa_key') }}" rsa: "{{ lookup('file', inventory_dir + '/ssh/bak_rsa_key') }}" ed25519: "{{ lookup('file', inventory_dir + '/ssh/bak_ed25519_key') }}" ecdsa: "{{ lookup('file', inventory_dir + '/ssh/bak_ecdsa_key') }}" @@ -2106,7 +2105,6 @@ straight to it: 3. Since we have decided to specify the keys above through file lookup, the above-listed keys now need to be generated:: - ssh-keygen -f ~/mysite/ssh/bak_dsa_key -N '' -t dsa ssh-keygen -f ~/mysite/ssh/bak_rsa_key -N '' -t rsa ssh-keygen -f ~/mysite/ssh/bak_ed25519_key -N '' -t ed25519 ssh-keygen -f ~/mysite/ssh/bak_ecdsa_key -N '' -t ecdsa @@ -2163,7 +2161,6 @@ So, back to the business: backup_encryption_key: "{{ lookup('pipe', 'gpg --homedir ~/mysite/gnupg/ --armour --export-secret-keys ' + ansible_fqdn ) }}" backup_server: bak.example.com backup_server_host_ssh_public_keys: - - "{{ lookup('file', inventory_dir + '/ssh/bak_dsa_key.pub') }}" - "{{ lookup('file', inventory_dir + '/ssh/bak_rsa_key.pub') }}" - "{{ lookup('file', inventory_dir + '/ssh/bak_ed25519_key.pub') }}" - "{{ lookup('file', inventory_dir + '/ssh/bak_ecdsa_key.pub') }}" diff --git a/roles/backup/molecule/default/group_vars/parameters-mandatory.yml b/roles/backup/molecule/default/group_vars/parameters-mandatory.yml index 520dcaee1d8661283ea0a777a2c3a797ba7d5f01..e4a4098f2ea3e379b8880860d5f9e6b10d3006ac 100644 --- a/roles/backup/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/backup/molecule/default/group_vars/parameters-mandatory.yml @@ -6,7 +6,6 @@ backup_patterns_filename: "test" backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-mandatory.asc') }}" backup_server: 10.31.127.10 backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/backup/molecule/default/group_vars/parameters-optional.yml b/roles/backup/molecule/default/group_vars/parameters-optional.yml index 14693dfc12f6849b837bdc50602ad5dd3c3fc70e..0f13b3006332e9f64481f79d0e79bcf6ce453753 100644 --- a/roles/backup/molecule/default/group_vars/parameters-optional.yml +++ b/roles/backup/molecule/default/group_vars/parameters-optional.yml @@ -10,7 +10,6 @@ backup_patterns: backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}" backup_server: 10.31.127.10 backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/backup/molecule/default/tests/data/ssh/server_dsa.pub b/roles/backup/molecule/default/tests/data/ssh/server_dsa.pub deleted file mode 100644 index edccdf329b89854629222b2a5f6b7b5740cdb88f..0000000000000000000000000000000000000000 --- a/roles/backup/molecule/default/tests/data/ssh/server_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== diff --git a/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml b/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml index 7363abc345c3a24fb049761b49a4b34c363ba600..dc2ef3e47b323008ebeeb789d2680dce49237d0d 100644 --- a/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml @@ -3,7 +3,6 @@ backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-mandatory.asc') }}" backup_server: 10.31.127.10 backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/backup_client/molecule/default/group_vars/parameters-optional.yml b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml index 54b07f8b68eb23d5f025a0f9a160b2317a941f67..6a39667964d968f3092d891cebd120659deb4ca4 100644 --- a/roles/backup_client/molecule/default/group_vars/parameters-optional.yml +++ b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml @@ -9,7 +9,6 @@ backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional. backup_server: 10.31.127.10 backup_server_destination: "/duplicity/{{ inventory_hostname }}" backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/backup_client/molecule/default/prepare.yml b/roles/backup_client/molecule/default/prepare.yml index 9f193697c592708bf2ef7df3192e662c84d14a6e..b712540408ddd9a5c46ad4d4451d80193a87cd50 100644 --- a/roles/backup_client/molecule/default/prepare.yml +++ b/roles/backup_client/molecule/default/prepare.yml @@ -30,7 +30,6 @@ group: root mode: 0600 with_dict: - tests/data/ssh/server_dsa: /etc/ssh/ssh_host_dsa_key tests/data/ssh/server_rsa: /etc/ssh/ssh_host_rsa_key tests/data/ssh/server_ed25519: /etc/ssh/ssh_host_ed25519_key tests/data/ssh/server_ecdsa: /etc/ssh/ssh_host_ecdsa_key diff --git a/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config b/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config index e3a1df72fe0469bed85963444ecfc99dc831ec3f..debf91313a8d0a39237994c41e9f6d7d49b4eef2 100644 --- a/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config +++ b/roles/backup_client/molecule/default/tests/data/backup_server_custom-sshd_config @@ -9,7 +9,6 @@ Port 22 Protocol 2 # HostKeys for protocol version 2 HostKey /etc/ssh/ssh_host_rsa_key -HostKey /etc/ssh/ssh_host_dsa_key HostKey /etc/ssh/ssh_host_ecdsa_key HostKey /etc/ssh/ssh_host_ed25519_key #Privilege Separation is turned on for security diff --git a/roles/backup_client/molecule/default/tests/data/ssh/parameters-mandatory-known_hosts b/roles/backup_client/molecule/default/tests/data/ssh/parameters-mandatory-known_hosts index 6621cd7fa947ecc0bb0c528fd193d530163b764e..b74cff96f3436a758dfa282d4a3ea4fb0f6af40c 100644 --- a/roles/backup_client/molecule/default/tests/data/ssh/parameters-mandatory-known_hosts +++ b/roles/backup_client/molecule/default/tests/data/ssh/parameters-mandatory-known_hosts @@ -1,5 +1,3 @@ -[10.31.127.10]:2222 ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== -10.31.127.10 ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== [10.31.127.10]:2222 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2SqbwZNanhTMM8wL1iGtNOR7nYbXcCQNbU65crXN43W1tz4GXoyluHEEXs0we7jmZZyow19X89Ve5w8ODL42KRDtNXoN8wjoLwZ1l7iGsrN1oUXJP7i6i9lH/0F+fudFB3Tm53ieBr0MEMdxAQBpk+MCi64G0iuvZeE0sKG5JfSky82ZZ26m5EchORJuiiKObB17EsUGl091S8eiLXIIiQQvg4d9933oAqNCLe0uxbNfJcbMJAdr+m9rYxyVoPXweUm1beb/6/vZQzAf0HL5+Ic/mbLu3z4httCh0dIlCqjRe/8llqF21psIlN8D8hZkzY6WEo7/v9wHAGFTFFFlJ 10.31.127.10 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2SqbwZNanhTMM8wL1iGtNOR7nYbXcCQNbU65crXN43W1tz4GXoyluHEEXs0we7jmZZyow19X89Ve5w8ODL42KRDtNXoN8wjoLwZ1l7iGsrN1oUXJP7i6i9lH/0F+fudFB3Tm53ieBr0MEMdxAQBpk+MCi64G0iuvZeE0sKG5JfSky82ZZ26m5EchORJuiiKObB17EsUGl091S8eiLXIIiQQvg4d9933oAqNCLe0uxbNfJcbMJAdr+m9rYxyVoPXweUm1beb/6/vZQzAf0HL5+Ic/mbLu3z4httCh0dIlCqjRe/8llqF21psIlN8D8hZkzY6WEo7/v9wHAGFTFFFlJ [10.31.127.10]:2222 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQzNj16lZ3ucIJvwnFYzR/vZT3SuWiIVPNOhK5JGlq6 diff --git a/roles/backup_client/molecule/default/tests/data/ssh/parameters-optional-known_hosts b/roles/backup_client/molecule/default/tests/data/ssh/parameters-optional-known_hosts index 6bd93f961a6177fe6dc4c160af65329477f5a810..a6ded363b306f46862a10c471778984c63969dad 100644 --- a/roles/backup_client/molecule/default/tests/data/ssh/parameters-optional-known_hosts +++ b/roles/backup_client/molecule/default/tests/data/ssh/parameters-optional-known_hosts @@ -1,5 +1,3 @@ -[10.31.127.10]:3333 ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== -10.31.127.10 ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== [10.31.127.10]:3333 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2SqbwZNanhTMM8wL1iGtNOR7nYbXcCQNbU65crXN43W1tz4GXoyluHEEXs0we7jmZZyow19X89Ve5w8ODL42KRDtNXoN8wjoLwZ1l7iGsrN1oUXJP7i6i9lH/0F+fudFB3Tm53ieBr0MEMdxAQBpk+MCi64G0iuvZeE0sKG5JfSky82ZZ26m5EchORJuiiKObB17EsUGl091S8eiLXIIiQQvg4d9933oAqNCLe0uxbNfJcbMJAdr+m9rYxyVoPXweUm1beb/6/vZQzAf0HL5+Ic/mbLu3z4httCh0dIlCqjRe/8llqF21psIlN8D8hZkzY6WEo7/v9wHAGFTFFFlJ 10.31.127.10 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2SqbwZNanhTMM8wL1iGtNOR7nYbXcCQNbU65crXN43W1tz4GXoyluHEEXs0we7jmZZyow19X89Ve5w8ODL42KRDtNXoN8wjoLwZ1l7iGsrN1oUXJP7i6i9lH/0F+fudFB3Tm53ieBr0MEMdxAQBpk+MCi64G0iuvZeE0sKG5JfSky82ZZ26m5EchORJuiiKObB17EsUGl091S8eiLXIIiQQvg4d9933oAqNCLe0uxbNfJcbMJAdr+m9rYxyVoPXweUm1beb/6/vZQzAf0HL5+Ic/mbLu3z4httCh0dIlCqjRe/8llqF21psIlN8D8hZkzY6WEo7/v9wHAGFTFFFlJ [10.31.127.10]:3333 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOQzNj16lZ3ucIJvwnFYzR/vZT3SuWiIVPNOhK5JGlq6 diff --git a/roles/backup_client/molecule/default/tests/data/ssh/server_dsa b/roles/backup_client/molecule/default/tests/data/ssh/server_dsa deleted file mode 100644 index d02624d4fff39fd17fcc134898aa8cd340699e88..0000000000000000000000000000000000000000 --- a/roles/backup_client/molecule/default/tests/data/ssh/server_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQC3/oHx0JwDDkeDfyIwmZZ4noz3AJHQevxPGMIhtuminkaN8dkN -m7nRVqiTLW7X3M9PvoVQDti72GJNrlTHtlqFcFkmRkAOH3BlK7OQeAh06Tpf5R7r -txosTbIQs/vLnkA6rPzWKfwXVHFOMiMb1CCOvt4Qf25Ec/C6XM2CSialZQIVAPrK -4yQB2thxWIW1tNyIYTK0a0G/AoGARVHZiVRTz0HfDcpwQJJPnijFEBUdgnGIA9cP -wX09FD/OYS/5mF9RGosvlN8pTeoPPkTWpUF9CMpiGDIrF0kTxdYBJVaW7ghfVVeP -XNN6v/S30aIFdbUaWXhM/SSucWwb4hJyPpCj/KNYr5iIwFZZ+9pZynR/reJ45muQ -gaRvcyUCgYAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+Z -PGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1H -L+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpggIVANDGn68D -y8jb/9mLaOM8bd9VFfdC ------END DSA PRIVATE KEY----- \ No newline at end of file diff --git a/roles/backup_client/molecule/default/tests/data/ssh/server_dsa.pub b/roles/backup_client/molecule/default/tests/data/ssh/server_dsa.pub deleted file mode 100644 index edccdf329b89854629222b2a5f6b7b5740cdb88f..0000000000000000000000000000000000000000 --- a/roles/backup_client/molecule/default/tests/data/ssh/server_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== diff --git a/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml index db65d081fb60f46db24cc9b63436e3e2437e36a2..143d8584f37003d2c3eb194a6c99bd81539774ea 100644 --- a/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/backup_server/molecule/default/group_vars/parameters-mandatory.yml @@ -1,7 +1,6 @@ --- backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/backup_server/molecule/default/group_vars/parameters-optional.yml b/roles/backup_server/molecule/default/group_vars/parameters-optional.yml index f18232e2eef721847f2efb5a12112d94f52d29a0..dc02fdab1376c77a892dc24ccba423e68f2f5156 100644 --- a/roles/backup_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/backup_server/molecule/default/group_vars/parameters-optional.yml @@ -1,7 +1,6 @@ --- backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/backup_server/molecule/default/tests/data/ssh/server_dsa b/roles/backup_server/molecule/default/tests/data/ssh/server_dsa deleted file mode 100644 index 12c97bc8b56671e48a48fab1074b4e3436c57177..0000000000000000000000000000000000000000 --- a/roles/backup_server/molecule/default/tests/data/ssh/server_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQC3/oHx0JwDDkeDfyIwmZZ4noz3AJHQevxPGMIhtuminkaN8dkN -m7nRVqiTLW7X3M9PvoVQDti72GJNrlTHtlqFcFkmRkAOH3BlK7OQeAh06Tpf5R7r -txosTbIQs/vLnkA6rPzWKfwXVHFOMiMb1CCOvt4Qf25Ec/C6XM2CSialZQIVAPrK -4yQB2thxWIW1tNyIYTK0a0G/AoGARVHZiVRTz0HfDcpwQJJPnijFEBUdgnGIA9cP -wX09FD/OYS/5mF9RGosvlN8pTeoPPkTWpUF9CMpiGDIrF0kTxdYBJVaW7ghfVVeP -XNN6v/S30aIFdbUaWXhM/SSucWwb4hJyPpCj/KNYr5iIwFZZ+9pZynR/reJ45muQ -gaRvcyUCgYAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+Z -PGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1H -L+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpggIVANDGn68D -y8jb/9mLaOM8bd9VFfdC ------END DSA PRIVATE KEY----- diff --git a/roles/backup_server/molecule/default/tests/test_default.py b/roles/backup_server/molecule/default/tests/test_default.py index 72cac4603998a6895dddd9c3440de39d1660efb7..54cc434d92bfb1b1d32c391bcd5f6e621211e82a 100644 --- a/roles/backup_server/molecule/default/tests/test_default.py +++ b/roles/backup_server/molecule/default/tests/test_default.py @@ -105,13 +105,6 @@ def test_backup_ssh_server_keys(host): with host.sudo(): - dsa = host.file('/etc/ssh-backup/ssh_host_dsa_key') - assert dsa.is_file - assert dsa.user == 'root' - assert dsa.group == 'root' - assert dsa.mode == 0o600 - assert dsa.content_string == open('tests/data/ssh/server_dsa', 'r').read() - rsa = host.file('/etc/ssh-backup/ssh_host_rsa_key') assert rsa.is_file assert rsa.user == 'root' diff --git a/roles/database/molecule/default/group_vars/parameters-optional.yml b/roles/database/molecule/default/group_vars/parameters-optional.yml index 4286afc962b1db0b8df6f2c87e7def6d685fbae7..1907e44e1f6d3e545d28425b73939fac341a2802 100644 --- a/roles/database/molecule/default/group_vars/parameters-optional.yml +++ b/roles/database/molecule/default/group_vars/parameters-optional.yml @@ -12,7 +12,6 @@ backup_client_username: "bak-localhost" backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}" backup_server: localhost backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/database/molecule/default/prepare.yml b/roles/database/molecule/default/prepare.yml index 97d285fa07e9ac41d87eafcddbc9a37206ffcf59..b4d51db5d50ce0fd8a491efb1e31659a15585e02 100644 --- a/roles/database/molecule/default/prepare.yml +++ b/roles/database/molecule/default/prepare.yml @@ -23,7 +23,6 @@ roles: - role: backup_server backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/database/molecule/default/tests/data/ssh/server_dsa b/roles/database/molecule/default/tests/data/ssh/server_dsa deleted file mode 100644 index d02624d4fff39fd17fcc134898aa8cd340699e88..0000000000000000000000000000000000000000 --- a/roles/database/molecule/default/tests/data/ssh/server_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQC3/oHx0JwDDkeDfyIwmZZ4noz3AJHQevxPGMIhtuminkaN8dkN -m7nRVqiTLW7X3M9PvoVQDti72GJNrlTHtlqFcFkmRkAOH3BlK7OQeAh06Tpf5R7r -txosTbIQs/vLnkA6rPzWKfwXVHFOMiMb1CCOvt4Qf25Ec/C6XM2CSialZQIVAPrK -4yQB2thxWIW1tNyIYTK0a0G/AoGARVHZiVRTz0HfDcpwQJJPnijFEBUdgnGIA9cP -wX09FD/OYS/5mF9RGosvlN8pTeoPPkTWpUF9CMpiGDIrF0kTxdYBJVaW7ghfVVeP -XNN6v/S30aIFdbUaWXhM/SSucWwb4hJyPpCj/KNYr5iIwFZZ+9pZynR/reJ45muQ -gaRvcyUCgYAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+Z -PGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1H -L+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpggIVANDGn68D -y8jb/9mLaOM8bd9VFfdC ------END DSA PRIVATE KEY----- \ No newline at end of file diff --git a/roles/database/molecule/default/tests/data/ssh/server_dsa.pub b/roles/database/molecule/default/tests/data/ssh/server_dsa.pub deleted file mode 100644 index edccdf329b89854629222b2a5f6b7b5740cdb88f..0000000000000000000000000000000000000000 --- a/roles/database/molecule/default/tests/data/ssh/server_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== diff --git a/roles/ldap_server/molecule/default/group_vars/backup-server.yml b/roles/ldap_server/molecule/default/group_vars/backup-server.yml index 8640a838891ed582d4526d619c776bec92e791d2..54c1912f830d957bfeff0b3e15ebbe0336cd191f 100644 --- a/roles/ldap_server/molecule/default/group_vars/backup-server.yml +++ b/roles/ldap_server/molecule/default/group_vars/backup-server.yml @@ -1,7 +1,6 @@ --- backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml b/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml index f314afb3b879d58f0975d3121c691b2b7dbbb05d..0d171399ed812c9cacd6fc76795488af0623925e 100644 --- a/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml @@ -71,7 +71,6 @@ backup_client_username: "bak-localhost" backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}" backup_server: localhost backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/ldap_server/molecule/default/prepare.yml b/roles/ldap_server/molecule/default/prepare.yml index 31dd4226c6bb26af610a4e3025cd00bc2b988e45..e8f944fb1d7c27d7ea879b4a70add5ecb500d2ad 100644 --- a/roles/ldap_server/molecule/default/prepare.yml +++ b/roles/ldap_server/molecule/default/prepare.yml @@ -85,7 +85,6 @@ roles: - role: backup_server backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/ldap_server/molecule/default/tests/data/ssh/server_dsa b/roles/ldap_server/molecule/default/tests/data/ssh/server_dsa deleted file mode 100644 index d02624d4fff39fd17fcc134898aa8cd340699e88..0000000000000000000000000000000000000000 --- a/roles/ldap_server/molecule/default/tests/data/ssh/server_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQC3/oHx0JwDDkeDfyIwmZZ4noz3AJHQevxPGMIhtuminkaN8dkN -m7nRVqiTLW7X3M9PvoVQDti72GJNrlTHtlqFcFkmRkAOH3BlK7OQeAh06Tpf5R7r -txosTbIQs/vLnkA6rPzWKfwXVHFOMiMb1CCOvt4Qf25Ec/C6XM2CSialZQIVAPrK -4yQB2thxWIW1tNyIYTK0a0G/AoGARVHZiVRTz0HfDcpwQJJPnijFEBUdgnGIA9cP -wX09FD/OYS/5mF9RGosvlN8pTeoPPkTWpUF9CMpiGDIrF0kTxdYBJVaW7ghfVVeP -XNN6v/S30aIFdbUaWXhM/SSucWwb4hJyPpCj/KNYr5iIwFZZ+9pZynR/reJ45muQ -gaRvcyUCgYAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+Z -PGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1H -L+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpggIVANDGn68D -y8jb/9mLaOM8bd9VFfdC ------END DSA PRIVATE KEY----- \ No newline at end of file diff --git a/roles/ldap_server/molecule/default/tests/data/ssh/server_dsa.pub b/roles/ldap_server/molecule/default/tests/data/ssh/server_dsa.pub deleted file mode 100644 index edccdf329b89854629222b2a5f6b7b5740cdb88f..0000000000000000000000000000000000000000 --- a/roles/ldap_server/molecule/default/tests/data/ssh/server_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== diff --git a/roles/mail_server/molecule/default/group_vars/parameters-optional.yml b/roles/mail_server/molecule/default/group_vars/parameters-optional.yml index e1ea8b98ff96d88a31b99632c25b1119308403a3..5adfec2ca8fe74686c034776f6b638495a7d8551 100644 --- a/roles/mail_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/mail_server/molecule/default/group_vars/parameters-optional.yml @@ -40,7 +40,6 @@ backup_client_username: "bak-parameters-optional-{{ ansible_distribution_release backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}" backup_server: ldap-server backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" diff --git a/roles/mail_server/molecule/default/host_vars/ldap-server.yml b/roles/mail_server/molecule/default/host_vars/ldap-server.yml index 9a15877c3f8ffe40ec528d6156ae9282dc0eab49..8d435d5403040d2bbb805a1ca3195a012374bdc0 100644 --- a/roles/mail_server/molecule/default/host_vars/ldap-server.yml +++ b/roles/mail_server/molecule/default/host_vars/ldap-server.yml @@ -38,7 +38,6 @@ ldap_client_config: # backup_server role backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/mail_server/molecule/default/tests/data/ssh/server_dsa b/roles/mail_server/molecule/default/tests/data/ssh/server_dsa deleted file mode 100644 index d02624d4fff39fd17fcc134898aa8cd340699e88..0000000000000000000000000000000000000000 --- a/roles/mail_server/molecule/default/tests/data/ssh/server_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQC3/oHx0JwDDkeDfyIwmZZ4noz3AJHQevxPGMIhtuminkaN8dkN -m7nRVqiTLW7X3M9PvoVQDti72GJNrlTHtlqFcFkmRkAOH3BlK7OQeAh06Tpf5R7r -txosTbIQs/vLnkA6rPzWKfwXVHFOMiMb1CCOvt4Qf25Ec/C6XM2CSialZQIVAPrK -4yQB2thxWIW1tNyIYTK0a0G/AoGARVHZiVRTz0HfDcpwQJJPnijFEBUdgnGIA9cP -wX09FD/OYS/5mF9RGosvlN8pTeoPPkTWpUF9CMpiGDIrF0kTxdYBJVaW7ghfVVeP -XNN6v/S30aIFdbUaWXhM/SSucWwb4hJyPpCj/KNYr5iIwFZZ+9pZynR/reJ45muQ -gaRvcyUCgYAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+Z -PGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1H -L+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpggIVANDGn68D -y8jb/9mLaOM8bd9VFfdC ------END DSA PRIVATE KEY----- \ No newline at end of file diff --git a/roles/mail_server/molecule/default/tests/data/ssh/server_dsa.pub b/roles/mail_server/molecule/default/tests/data/ssh/server_dsa.pub deleted file mode 100644 index edccdf329b89854629222b2a5f6b7b5740cdb88f..0000000000000000000000000000000000000000 --- a/roles/mail_server/molecule/default/tests/data/ssh/server_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg== diff --git a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml index d993ea545799e42a2e3e04a9c28c861fc057c99a..5b6770eeadc3e9454db6dc1e358870020abd5d27 100644 --- a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml @@ -27,7 +27,6 @@ backup_client_username: "bak-parameters-optional-{{ ansible_distribution_release backup_encryption_key: "{{ lookup('file', 'tests/data/gnupg/parameters-optional.asc') }}" backup_server: backup-server backup_server_host_ssh_public_keys: - - "{{ lookup('file', 'tests/data/ssh/server_dsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" 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 5f9fc3c1e6ef28d86ab11208ea65938540db1c26..7fff83fc57a1e7f18c8d30e85a8785c5a9f0a09c 100644 --- a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml +++ b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml @@ -35,7 +35,6 @@ ldap_client_config: # backup_server role. backup_host_ssh_private_keys: - dsa: "{{ lookup('file', 'tests/data/ssh/server_dsa') }}" rsa: "{{ lookup('file', 'tests/data/ssh/server_rsa') }}" ed25519: "{{ lookup('file', 'tests/data/ssh/server_ed25519') }}" ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}" diff --git a/roles/xmpp_server/molecule/default/tests/data/ssh/server_dsa b/roles/xmpp_server/molecule/default/tests/data/ssh/server_dsa deleted file mode 100644 index d02624d4fff39fd17fcc134898aa8cd340699e88..0000000000000000000000000000000000000000 --- a/roles/xmpp_server/molecule/default/tests/data/ssh/server_dsa +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN DSA PRIVATE KEY----- -MIIBuwIBAAKBgQC3/oHx0JwDDkeDfyIwmZZ4noz3AJHQevxPGMIhtuminkaN8dkN -m7nRVqiTLW7X3M9PvoVQDti72GJNrlTHtlqFcFkmRkAOH3BlK7OQeAh06Tpf5R7r -txosTbIQs/vLnkA6rPzWKfwXVHFOMiMb1CCOvt4Qf25Ec/C6XM2CSialZQIVAPrK -4yQB2thxWIW1tNyIYTK0a0G/AoGARVHZiVRTz0HfDcpwQJJPnijFEBUdgnGIA9cP -wX09FD/OYS/5mF9RGosvlN8pTeoPPkTWpUF9CMpiGDIrF0kTxdYBJVaW7ghfVVeP -XNN6v/S30aIFdbUaWXhM/SSucWwb4hJyPpCj/KNYr5iIwFZZ+9pZynR/reJ45muQ -gaRvcyUCgYAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+Z -PGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1H -L+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpggIVANDGn68D -y8jb/9mLaOM8bd9VFfdC ------END DSA PRIVATE KEY----- \ No newline at end of file diff --git a/roles/xmpp_server/molecule/default/tests/data/ssh/server_dsa.pub b/roles/xmpp_server/molecule/default/tests/data/ssh/server_dsa.pub deleted file mode 100644 index edccdf329b89854629222b2a5f6b7b5740cdb88f..0000000000000000000000000000000000000000 --- a/roles/xmpp_server/molecule/default/tests/data/ssh/server_dsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-dss AAAAB3NzaC1kc3MAAACBALf+gfHQnAMOR4N/IjCZlniejPcAkdB6/E8YwiG26aKeRo3x2Q2budFWqJMtbtfcz0++hVAO2LvYYk2uVMe2WoVwWSZGQA4fcGUrs5B4CHTpOl/lHuu3GixNshCz+8ueQDqs/NYp/BdUcU4yIxvUII6+3hB/bkRz8LpczYJKJqVlAAAAFQD6yuMkAdrYcViFtbTciGEytGtBvwAAAIBFUdmJVFPPQd8NynBAkk+eKMUQFR2CcYgD1w/BfT0UP85hL/mYX1Eaiy+U3ylN6g8+RNalQX0IymIYMisXSRPF1gElVpbuCF9VV49c03q/9LfRogV1tRpZeEz9JK5xbBviEnI+kKP8o1ivmIjAVln72lnKdH+t4njma5CBpG9zJQAAAIAYAG/Udg4i/2q8Iemqs5TuP48ge1CxQcyFw4vVl2zr85MPZ24rBf+ZPGy1CsEBpJqHQ5agftMYR9CRcxlqAP44JpIPcSq1NsL59HnXDsdCe/IJjO4JmL1HL+VIcWkXgj0MxGds8hck+HC5lX7jGAKjZBea8ksBZD/Ma2WvYKXpgg==