Merge pull request #28 from kostyrevaa/master

Do not manage /var/run/sshd on CentOS7 fixes #27
This commit is contained in:
Matt Willsher 2015-08-13 03:33:02 +01:00
commit 10a5a155f7
2 changed files with 3 additions and 0 deletions

View file

@ -7,6 +7,8 @@ sshd_skip_defaults: false
sshd_manage_service: "{{ false if ansible_virtualization_type == 'docker' else true }}" sshd_manage_service: "{{ false if ansible_virtualization_type == 'docker' else true }}"
# If the below is false, don't reload the ssh deamon on change # If the below is false, don't reload the ssh deamon on change
sshd_allow_reload: "{{ sshd_manage_service }}" sshd_allow_reload: "{{ sshd_manage_service }}"
# If the below is false, don't manage /var/run/sshd directory
sshd_manage_var_run: "{{ false if ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7' else true }}"
# Empty dicts to avoid errors # Empty dicts to avoid errors
sshd: {} sshd: {}

View file

@ -30,6 +30,7 @@
path: /var/run/sshd path: /var/run/sshd
state: directory state: directory
mode: 0755 mode: 0755
when: sshd_manage_var_run
tags: tags:
- sshd - sshd