libretic/ansible-sshd
6
0
Fork 0
mirror of https://github.com/willshersystems/ansible-sshd synced 2024-11-25 12:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add whitespace around the filter symbol

Browse source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Jakub Jelen 2024-01-22 16:17:38 +01:00
parent 32b892c3e3
commit d3e3bdce5a
9 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
handlers/main.yml
View file

@ -6,7 +6,7 @@
state: reloaded state: reloaded
when: when:
- sshd_allow_reload|bool - sshd_allow_reload|bool
- ansible_facts['virtualization_type']|default(None) not in __sshd_skip_virt_env - ansible_facts['virtualization_type'] | default(None) not in __sshd_skip_virt_env
- ansible_connection != 'chroot' - ansible_connection != 'chroot'
- ansible_facts['os_family'] != 'AIX' - ansible_facts['os_family'] != 'AIX'
- ansible_facts['os_family'] != 'OpenWrt' - ansible_facts['os_family'] != 'OpenWrt'

2
tasks/find_ports.yml
View file

@ -23,4 +23,4 @@
when: when:
- sshd_manage_firewall | bool or sshd_manage_selinux | bool - sshd_manage_firewall | bool or sshd_manage_selinux | bool
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['virtualization_type']|default(None) not in __sshd_skip_virt_env - ansible_facts['virtualization_type'] | default(None) not in __sshd_skip_virt_env

4
tasks/install.yml
View file

@ -132,14 +132,14 @@
- sshd_manage_firewall | bool - sshd_manage_firewall | bool
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_version'] is version('7', '>=') - ansible_facts['distribution_version'] is version('7', '>=')
- ansible_facts['virtualization_type']|default(None) not in __sshd_skip_virt_env - ansible_facts['virtualization_type'] | default(None) not in __sshd_skip_virt_env
- name: Configure selinux - name: Configure selinux
ansible.builtin.include_tasks: selinux.yml ansible.builtin.include_tasks: selinux.yml
when: when:
- sshd_manage_selinux | bool - sshd_manage_selinux | bool
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['virtualization_type']|default(None) not in __sshd_skip_virt_env - ansible_facts['virtualization_type'] | default(None) not in __sshd_skip_virt_env
- name: Create the complete configuration file - name: Create the complete configuration file
ansible.builtin.include_tasks: install_config.yml ansible.builtin.include_tasks: install_config.yml

4
tasks/install_service.yml
View file

@ -34,7 +34,7 @@
state: started state: started
when: when:
- sshd_manage_service|bool - sshd_manage_service|bool
- ansible_facts['virtualization_type']|default(None) not in __sshd_skip_virt_env - ansible_facts['virtualization_type'] | default(None) not in __sshd_skip_virt_env
- ansible_connection != 'chroot' - ansible_connection != 'chroot'
# Due to ansible bug 21026, cannot use service module on RHEL 7 # Due to ansible bug 21026, cannot use service module on RHEL 7
@ -43,5 +43,5 @@
when: when:
- ansible_connection == 'chroot' - ansible_connection == 'chroot'
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int >= 7 - ansible_facts['distribution_major_version'] | int >= 7
changed_when: true changed_when: true

2
tests/tasks/restore.yml
View file

@ -38,6 +38,6 @@
changed_when: false changed_when: false
when: when:
- __sshd_test_backup is defined - __sshd_test_backup is defined
- ansible_facts['virtualization_type']|default(None) not in __sshd_skip_virt_env - ansible_facts['virtualization_type'] | default(None) not in __sshd_skip_virt_env
- ansible_connection != 'chroot' - ansible_connection != 'chroot'
- ansible_facts['os_family'] != 'AIX' - ansible_facts['os_family'] != 'AIX'

4
tests/tasks/setup.yml
View file

@ -57,5 +57,5 @@
main_sshd_config_name: 00-ansible_system_role.conf main_sshd_config_name: 00-ansible_system_role.conf
main_sshd_config_path: /etc/ssh/sshd_config.d/ main_sshd_config_path: /etc/ssh/sshd_config.d/
when: when:
- (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version']|int > 8) or - (ansible_facts['os_family'] == 'RedHat' and ansible_facts['distribution_major_version'] | int > 8) or
(ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version']|int >= 22) (ansible_facts['distribution'] == 'Ubuntu' and ansible_facts['distribution_major_version'] | int >= 22)

14
tests/tests_alternative_file.yml
View file

@ -104,7 +104,7 @@
- "'AuthorizedKeysFile .ssh/authorized_keys' in config.content | b64decode" - "'AuthorizedKeysFile .ssh/authorized_keys' in config.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 8 - ansible_facts['distribution_major_version'] | int > 8
- name: Check RHEL7 and RHEL8 defaults are present in the first configuration file - name: Check RHEL7 and RHEL8 defaults are present in the first configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -114,8 +114,8 @@
- "'UsePAM yes' in config.content | b64decode" - "'UsePAM yes' in config.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 6 - ansible_facts['distribution_major_version'] | int > 6
- ansible_facts['distribution_major_version']|int < 9 - ansible_facts['distribution_major_version'] | int < 9
- name: Check RHEL6 defaults are present in the first configuration file - name: Check RHEL6 defaults are present in the first configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -133,7 +133,7 @@
- "'UsePAM yes' in config.content | b64decode" - "'UsePAM yes' in config.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'Debian' - ansible_facts['os_family'] == 'Debian'
- ansible_facts['distribution_major_version']|int < 22 - ansible_facts['distribution_major_version'] | int < 22
- name: Check Ubuntu 22 defaults are present in the first configuration file - name: Check Ubuntu 22 defaults are present in the first configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -143,7 +143,7 @@
- "'UsePAM yes' in config.content | b64decode" - "'UsePAM yes' in config.content | b64decode"
when: when:
- ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_major_version']|int >= 22 - ansible_facts['distribution_major_version'] | int >= 22
- name: Check content of second configuration file - name: Check content of second configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -172,7 +172,7 @@
- "'Subsystem sftp /usr/libexec/openssh/sftp-server' in config3.content | b64decode" - "'Subsystem sftp /usr/libexec/openssh/sftp-server' in config3.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 8 - ansible_facts['distribution_major_version'] | int > 8
- ansible_facts['distribution'] != 'Fedora' - ansible_facts['distribution'] != 'Fedora'
- name: Check the main configuration file contains some default values for Fedora - name: Check the main configuration file contains some default values for Fedora
@ -183,7 +183,7 @@
- "'Subsystem sftp /usr/libexec/sftp-server' in config3.content | b64decode" - "'Subsystem sftp /usr/libexec/sftp-server' in config3.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 8 - ansible_facts['distribution_major_version'] | int > 8
- ansible_facts['distribution'] == 'Fedora' - ansible_facts['distribution'] == 'Fedora'
- name: Check the generated config has requested properties - name: Check the generated config has requested properties

15
tests/tests_alternative_file_role.yml
View file

@ -122,7 +122,7 @@
- "'AuthorizedKeysFile .ssh/authorized_keys' in config.content | b64decode" - "'AuthorizedKeysFile .ssh/authorized_keys' in config.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 8 - ansible_facts['distribution_major_version'] | int > 8
- name: Check RHEL7 and RHEL8 defaults are present in the first configuration file - name: Check RHEL7 and RHEL8 defaults are present in the first configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -132,8 +132,8 @@
- "'UsePAM yes' in config.content | b64decode" - "'UsePAM yes' in config.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 6 - ansible_facts['distribution_major_version'] | int > 6
- ansible_facts['distribution_major_version']|int < 9 - ansible_facts['distribution_major_version'] | int < 9
- name: Check RHEL6 defaults are present in the first configuration file - name: Check RHEL6 defaults are present in the first configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -151,7 +151,7 @@
- "'UsePAM yes' in config.content | b64decode" - "'UsePAM yes' in config.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'Debian' - ansible_facts['os_family'] == 'Debian'
- ansible_facts['distribution_major_version']|int < 22 - ansible_facts['distribution_major_version'] | int < 22
- name: Check Ubuntu 22 defaults are present in the first configuration file - name: Check Ubuntu 22 defaults are present in the first configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -161,8 +161,7 @@
- "'UsePAM yes' in config.content | b64decode" - "'UsePAM yes' in config.content | b64decode"
when: when:
- ansible_facts['distribution'] == 'Ubuntu' - ansible_facts['distribution'] == 'Ubuntu'
- ansible_facts['distribution_major_version']|int >= 22 - ansible_facts['distribution_major_version'] | int >= 22
- name: Check content of second configuration file - name: Check content of second configuration file
ansible.builtin.assert: ansible.builtin.assert:
@ -191,7 +190,7 @@
- "'Subsystem sftp /usr/libexec/openssh/sftp-server' in config3.content | b64decode" - "'Subsystem sftp /usr/libexec/openssh/sftp-server' in config3.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 8 - ansible_facts['distribution_major_version'] | int > 8
- ansible_facts['distribution'] != 'Fedora' - ansible_facts['distribution'] != 'Fedora'
- name: Check the main configuration file contains some default values for Fedora - name: Check the main configuration file contains some default values for Fedora
@ -202,7 +201,7 @@
- "'Subsystem sftp /usr/libexec/sftp-server' in config3.content | b64decode" - "'Subsystem sftp /usr/libexec/sftp-server' in config3.content | b64decode"
when: when:
- ansible_facts['os_family'] == 'RedHat' - ansible_facts['os_family'] == 'RedHat'
- ansible_facts['distribution_major_version']|int > 8 - ansible_facts['distribution_major_version'] | int > 8
- ansible_facts['distribution'] == 'Fedora' - ansible_facts['distribution'] == 'Fedora'
- name: Check the generated config has requested properties - name: Check the generated config has requested properties

2
tests/tests_sysconfig.yml
View file

@ -23,7 +23,7 @@
when: when:
- ansible_facts['os_family'] == "RedHat" - ansible_facts['os_family'] == "RedHat"
- ansible_facts['distribution'] != 'Fedora' - ansible_facts['distribution'] != 'Fedora'
- ansible_facts['distribution_major_version']|int < 9 - ansible_facts['distribution_major_version'] | int < 9
block: block:
- name: Flush handlers - name: Flush handlers
ansible.builtin.meta: flush_handlers ansible.builtin.meta: flush_handlers