saltstack-formulas/openssh-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Specify config clause only if defined in pillar.

Browse Source 
Signed-off-by: POTIER Mathieu <mathieu.potier@onzeway.eu>
This commit is contained in:
POTIER Mathieu 2015-11-18 20:33:50 +01:00
parent dda1fb5128
commit f55445211c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssh/auth.sls
View File

@ -38,14 +38,18 @@ include:
{{ print_name(identifier, key) }}: {{ print_name(identifier, key) }}:
ssh_auth.present: ssh_auth.present:
{{ print_ssh_auth(identifier, key) }} {{ print_ssh_auth(identifier, key) }}
{%- if 'sshd_config' in pillar and 'AuthorizedKeysFile' in pillar['sshd_config'] %}
- config: {{ pillar['sshd_config']['AuthorizedKeysFile'] }} - config: {{ pillar['sshd_config']['AuthorizedKeysFile'] }}
{% endif -%}
- require: - require:
- service: {{ openssh.service }} - service: {{ openssh.service }}
{%- else %} {%- else %}
{{ print_name(identifier, key) }}: {{ print_name(identifier, key) }}:
ssh_auth.absent: ssh_auth.absent:
{{ print_ssh_auth(identifier, key) }} {{ print_ssh_auth(identifier, key) }}
{%- if 'sshd_config' in pillar and 'AuthorizedKeysFile' in pillar['sshd_config'] %}
- config: {{ pillar['sshd_config']['AuthorizedKeysFile'] }} - config: {{ pillar['sshd_config']['AuthorizedKeysFile'] }}
{% endif -%}
{%- endif -%} {%- endif -%}
{%- endfor -%} {%- endfor -%}
{%- endfor -%} {%- endfor -%}