Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2026-05-26 03:13:10 +02:00
Code Issues Activity

fix(templating): sort file contents when looping

Browse Source 
This makes file contents deterministic, helping idempotency.
This commit is contained in:
Matthew Thode 2020-05-17 16:58:57 -05:00
parent 5c0e083288
commit aae2b5e194
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
users/init.sls
View File

@ -275,12 +275,12 @@ users_authorized_keys_{{ name }}:
- mode: 600
{% if 'ssh_auth_file' in user %}
- contents: |
{% for auth in user.ssh_auth_file -%}
{% for auth in user.ssh_auth_file | sort -%}
{{ auth }}
{% endfor -%}
{% else %}
- contents: |
{%- for key_name, pillar_name in user['ssh_auth_pillar'].items() %}
{%- for key_name, pillar_name in user['ssh_auth_pillar'].items() | sort %}
{{ salt['pillar.get'](pillar_name + ':' + key_name + ':pubkey', '') }}
{%- endfor %}
{% endif %}
@ -381,10 +381,10 @@ users_ssh_config_{{ name }}:
- contents: |
# Managed by Saltstack
# Do Not Edit
{% for label, setting in user.ssh_config.items() %}
{% for label, setting in user.ssh_config.items() | sort %}
# {{ label }}
Host {{ setting.get('hostname') }}
{%- for opts in setting.get('options') %}
{%- for opts in setting.get('options') | sort %}
{{ opts }}
{%- endfor %}
{% endfor -%}
@ -478,7 +478,7 @@ users_{{ users.sudoers_dir }}/{{ name }}:
- name: {{ users.sudoers_dir }}/{{ sudoers_d_filename }}
- contents: |
{%- if 'sudo_defaults' in user %}
{%- for entry in user['sudo_defaults'] %}
{%- for entry in user['sudo_defaults'] | sort %}
Defaults:{{ name }} {{ entry }}
{%- endfor %}
{%- endif %}
@ -488,7 +488,7 @@ users_{{ users.sudoers_dir }}/{{ name }}:
# Your changes will be overwritten.
########################################################################
#
{%- for rule in user['sudo_rules'] %}
{%- for rule in user['sudo_rules'] | sort %}
{{ name }} {{ rule }}
{%- endfor %}
{%- endif %}