Salt
/
openssh-formula
mirror of https://github.com/saltstack-formulas/openssh-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #109 from saltstack-formulas/UsePrivilegeSeparation 

CentOS 6: UsePrivilegeSeparation 'yes' (fixes #108)
This commit is contained in:
Niels Abspoel 2017-08-01 21:50:53 +02:00 committed by GitHub
parent 9b7fc59a35 f4cf9aa22b
commit 0924649158
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openssh/map.jinja
View File

@ -84,9 +84,20 @@ that differ from whats in defaults.yaml
, merge=salt['pillar.get']('sshd_config:lookup'))
%}
{% set os_finger_map = salt['grains.filter_by']({
'CentOS-6': {
'UsePrivilegeSeparation': 'yes',
},
'default': {}
}
, grain="osfinger"
, merge=salt['pillar.get']('sshd_config:lookup'))
%}
{## Merge the flavor_map to the default settings ##}
{% do default_settings.sshd_config.update(os_family_map) %}
{% do default_settings.sshd_config.update(os_finger_map) %}
{## Merge in sshd_config:lookup pillar ##}
{% set sshd_config = salt['pillar.get'](