Merge pull request #12 from z-saltstack/auth-sls-clean-whitespaces

Removed unneeded whitespace from auth.sls
This commit is contained in:
Seth House 2014-04-28 18:03:58 -06:00
commit cee3f097f0
1 changed files with 24 additions and 25 deletions

View File

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