Merge pull request #95 from AaltoScienceIT/chroot

Make role work with chroot connections on EL 7.
This commit is contained in:
Matt Willsher 2018-09-22 19:14:28 +01:00 committed by GitHub
commit 6f43191418
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions

View file

@ -3,5 +3,8 @@
service:
name: "{{ sshd_service }}"
state: reloaded
when: "sshd_allow_reload and ansible_virtualization_type|default(None) != 'docker'"
when:
- sshd_allow_reload
- ansible_virtualization_type|default(None) != 'docker'
- ansible_connection != 'chroot'
listen: reload_sshd

View file

@ -41,7 +41,18 @@
name: "{{ sshd_service }}"
enabled: true
state: started
when: "sshd_manage_service and ansible_virtualization_type|default(None) != 'docker'"
when:
- sshd_manage_service
- ansible_virtualization_type|default(None) != 'docker'
- ansible_connection != 'chroot'
# Due to ansible bug 21026, cannot use service module on RHEL 7
- name: Enable service in chroot
command: systemctl enable {{ sshd_service }}
when:
- ansible_connection == 'chroot'
- ansible_os_family == 'RedHat'
- ansible_distribution_major_version|int >= 7
- name: Register that this role has run
set_fact: sshd_has_run=true