diff --git a/roles/backup/molecule/default/group_vars/parameters-mandatory.yml b/roles/backup/molecule/default/group_vars/parameters-mandatory.yml index e4a4098f2ea3e379b8880860d5f9e6b10d3006ac..cdd55e11f1558e2cb224c0127ba6e01b209ef1e3 100644 --- a/roles/backup/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/backup/molecule/default/group_vars/parameters-mandatory.yml @@ -9,4 +9,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory') }}" diff --git a/roles/backup/molecule/default/group_vars/parameters-optional.yml b/roles/backup/molecule/default/group_vars/parameters-optional.yml index 0f13b3006332e9f64481f79d0e79bcf6ce453753..947fb105eb5116e15e438e9e4c6d58aaedfdf77b 100644 --- a/roles/backup/molecule/default/group_vars/parameters-optional.yml +++ b/roles/backup/molecule/default/group_vars/parameters-optional.yml @@ -13,4 +13,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory') }}" 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 7630a5b45117240703eda5791d27a46096a1c010..c2146fc8d416788b505adbc0e286e031c65a1763 100644 --- a/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml +++ b/roles/backup_client/molecule/default/group_vars/parameters-mandatory.yml @@ -6,4 +6,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory') }}" 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 eebb13779147fd725e5f22f9183724317fbde886..7afe8d0e5a7a5b72fe594f90d583f1c7d1ebbc95 100644 --- a/roles/backup_client/molecule/default/group_vars/parameters-optional.yml +++ b/roles/backup_client/molecule/default/group_vars/parameters-optional.yml @@ -13,4 +13,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" backup_server_port: 3333 -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional') }}" diff --git a/roles/database/molecule/default/group_vars/parameters-optional.yml b/roles/database/molecule/default/group_vars/parameters-optional.yml index 2e88e88437559b01407341a9f87594a1c59601ac..7a0b0d980de65efb9347bc58d5f18d6a9bf2fea6 100644 --- a/roles/database/molecule/default/group_vars/parameters-optional.yml +++ b/roles/database/molecule/default/group_vars/parameters-optional.yml @@ -12,4 +12,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional') }}" 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 6785ab720211f561b57cd16f706e8ce0bcd0d808..ec2718e61b8440ee0143a4eddc2ae9ea1c0c15f7 100644 --- a/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/ldap_server/molecule/default/group_vars/parameters-optional.yml @@ -76,4 +76,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional') }}" 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 f40a2b3898ef0206578b8dcac4dd1cbafd3d4707..8e619365dad3c017ecd19c095055c31e769c4591 100644 --- a/roles/mail_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/mail_server/molecule/default/group_vars/parameters-optional.yml @@ -49,4 +49,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional') }}" diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml index 5d424899213f12d9da906fd2ea7f50d8f8b721a2..93303a1c894c75abdf229df8e4b3b94c7e02d6ba 100644 --- a/roles/mail_server/molecule/default/prepare.yml +++ b/roles/mail_server/molecule/default/prepare.yml @@ -22,7 +22,7 @@ - "server" - "{{ item.name }}" - "{{ item.fqdn }}" - - "{{ item.fqdn[:item.fqdn.rfind('-')] }}" + - "{{ item.fqdn[: item.fqdn.rfind('-')] }}" with_items: - name: clamav-database_https fqdn: database.clamav.net diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml index fe209f64ee1b645efb3f75e4bc807c9c62441fc1..db710f93cb9b7fe11f84823340dd2f8548b84729 100644 --- a/roles/wsgi_website/tasks/main.yml +++ b/roles/wsgi_website/tasks/main.yml @@ -300,7 +300,7 @@ # This specific task is used in order to work around inability of Ansible # to provide properly parametrised handlers for reusable roles. set_fact: - wsgi_services_to_restart: "{{ wsgi_services_to_restart + [ fqdn ] }}" + wsgi_services_to_restart: "{{ wsgi_services_to_restart + [fqdn] }}" when: | fqdn not in wsgi_services_to_restart and ((install_extra_packages is defined and install_extra_packages.changed) or 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 833e27449ca50304a1f715b1d3de66131454cb93..7ae223054d1beb669968757e87768a3b6c2e59a6 100644 --- a/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml +++ b/roles/xmpp_server/molecule/default/group_vars/parameters-optional.yml @@ -30,4 +30,4 @@ backup_server_host_ssh_public_keys: - "{{ lookup('file', 'tests/data/ssh/server_rsa.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ed25519.pub') }}" - "{{ lookup('file', 'tests/data/ssh/server_ecdsa.pub') }}" -backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional' ) }}" +backup_ssh_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional') }}"