diff --git a/openssh/auth.sls b/openssh/auth.sls index f7690b3..617b117 100644 --- a/openssh/auth.sls +++ b/openssh/auth.sls @@ -1,43 +1,42 @@ include: - openssh - -{% from "openssh/map.jinja" import openssh with context %} -{% set openssh_pillar = pillar.get('openssh', {}) %} -{% set auth = openssh_pillar.get('auth', {}) %} -{% for user,keys in auth.items() -%} - {% for key in keys -%} +{%- from "openssh/map.jinja" import openssh with context -%} +{%- set openssh_pillar = pillar.get('openssh', {}) -%} +{%- set auth = openssh_pillar.get('auth', {}) -%} +{%- for user,keys in auth.items() -%} + {%- for key in keys -%} {% if 'present' in key and key['present'] %} {{ key['name'] }}: ssh_auth.present: - user: {{ user }} - {% if 'source' in key %} + {%- if 'source' in key %} - source: {{ key['source'] }} - {% else %} - {% if 'enc' in key %} + {%- else %} + {%- if 'enc' in key %} - enc: {{ key['enc'] }} - {% endif %} - {% if 'comment' in key %} + {%- endif -%} + {%- if 'comment' in key %} - comment: {{ key['comment'] }} - {% endif %} - {% if 'options' in key %} + {%- endif -%} + {%- if 'options' in key %} - options: {{ key['options'] }} - {% endif %} - {% endif %} + {%- endif -%} + {%- endif %} - require: - service: {{ openssh.service }} - {% else %} + {%- else %} {{ key['name'] }}: ssh_auth.absent: - user: {{ user }} - {% if 'enc' in key %} + {%- if 'enc' in key %} - enc: {{ key['enc'] }} - {% endif %} - {% if 'comment' in key %} + {%- endif -%} + {%- if 'comment' in key %} - comment: {{ key['comment'] }} - {% endif %} - {% if 'options' in key %} + {%- endif -%} + {%- if 'options' in key %} - options: {{ key['options'] }} - {% endif %} - {% endif %} - {% endfor %} -{% endfor %} + {%- endif -%} + {%- endif -%} + {%- endfor -%} +{%- endfor -%}