style: quote numbers and file modes
salt linters complain about these.
This commit is contained in:
parent
b5aac7797c
commit
db30289046
@ -20,7 +20,7 @@ users_{{ name }}_user_bashrc:
|
|||||||
- name: {{ home }}/.bashrc
|
- name: {{ home }}/.bashrc
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 644
|
- mode: '0644'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source:
|
- source:
|
||||||
- salt://users/files/bashrc/{{ name }}/bashrc
|
- salt://users/files/bashrc/{{ name }}/bashrc
|
||||||
|
@ -13,7 +13,7 @@ users_{{ users.googleauth_dir }}:
|
|||||||
- name: {{ users.googleauth_dir }}
|
- name: {{ users.googleauth_dir }}
|
||||||
- user: root
|
- user: root
|
||||||
- group: {{ users.root_group }}
|
- group: {{ users.root_group }}
|
||||||
- mode: 600
|
- mode: '0600'
|
||||||
|
|
||||||
{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
|
{%- for name, user in pillar.get('users', {}).items() if user.absent is not defined or not user.absent %}
|
||||||
{%- if 'google_auth' in user %}
|
{%- if 'google_auth' in user %}
|
||||||
|
@ -221,8 +221,8 @@ user_keydir_{{ name }}:
|
|||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- makedirs: True
|
- makedirs: True
|
||||||
- mode: 700
|
- mode: '0700'
|
||||||
- dir_mode: 700
|
- dir_mode: '0700'
|
||||||
- require:
|
- require:
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
@ -246,9 +246,9 @@ users_{{ name }}_{{ key_name }}_key:
|
|||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
{% if key_name.endswith(".pub") %}
|
{% if key_name.endswith(".pub") %}
|
||||||
- mode: 644
|
- mode: '0644'
|
||||||
{% else %}
|
{% else %}
|
||||||
- mode: 600
|
- mode: '0600'
|
||||||
{% endif %}
|
{% endif %}
|
||||||
- show_diff: False
|
- show_diff: False
|
||||||
{%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %}
|
{%- set key_value = salt['pillar.get']('users:'+name+':ssh_keys:'+_key) %}
|
||||||
@ -272,7 +272,7 @@ users_authorized_keys_{{ name }}:
|
|||||||
- name: {{ home }}/.ssh/authorized_keys
|
- name: {{ home }}/.ssh/authorized_keys
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 600
|
- mode: '0600'
|
||||||
{% if 'ssh_auth_file' in user %}
|
{% if 'ssh_auth_file' in user %}
|
||||||
- contents: |
|
- contents: |
|
||||||
{% for auth in user.ssh_auth_file -%}
|
{% for auth in user.ssh_auth_file -%}
|
||||||
@ -305,7 +305,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_private_key:
|
|||||||
- name: {{ home }}/.ssh/{{ key_name }}
|
- name: {{ home }}/.ssh/{{ key_name }}
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 600
|
- mode: '0600'
|
||||||
- show_diff: False
|
- show_diff: False
|
||||||
- contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
|
- contents_pillar: {{ pillar_name }}:{{ key_name }}:privkey
|
||||||
- require:
|
- require:
|
||||||
@ -318,7 +318,7 @@ user_ssh_keys_files_{{ name }}_{{ key_name }}_public_key:
|
|||||||
- name: {{ home }}/.ssh/{{ key_name }}.pub
|
- name: {{ home }}/.ssh/{{ key_name }}.pub
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 644
|
- mode: '0644'
|
||||||
- show_diff: False
|
- show_diff: False
|
||||||
- contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
|
- contents_pillar: {{ pillar_name }}:{{ key_name }}:pubkey
|
||||||
- require:
|
- require:
|
||||||
@ -377,7 +377,7 @@ users_ssh_config_{{ name }}:
|
|||||||
- name: {{ home }}/.ssh/config
|
- name: {{ home }}/.ssh/config
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 640
|
- mode: '0640'
|
||||||
- contents: |
|
- contents: |
|
||||||
# Managed by Saltstack
|
# Managed by Saltstack
|
||||||
# Do Not Edit
|
# Do Not Edit
|
||||||
@ -516,7 +516,7 @@ users_googleauth-{{ svc }}-{{ name }}:
|
|||||||
- contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
|
- contents_pillar: 'users:{{ name }}:google_auth:{{ svc }}'
|
||||||
- user: root
|
- user: root
|
||||||
- group: {{ users.root_group }}
|
- group: {{ users.root_group }}
|
||||||
- mode: 400
|
- mode: '0400'
|
||||||
- require:
|
- require:
|
||||||
- pkg: users_googleauth-package
|
- pkg: users_googleauth-package
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
@ -20,7 +20,7 @@ users_{{ name }}_user_profile:
|
|||||||
- name: {{ home }}/.profile
|
- name: {{ home }}/.profile
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 644
|
- mode: '0644'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source:
|
- source:
|
||||||
- salt://users/files/profile/{{ name }}/profile
|
- salt://users/files/profile/{{ name }}/profile
|
||||||
|
@ -24,7 +24,7 @@ users_{{ name }}_user_vimrc:
|
|||||||
- name: {{ home }}/.vimrc
|
- name: {{ home }}/.vimrc
|
||||||
- user: {{ name }}
|
- user: {{ name }}
|
||||||
- group: {{ user_group }}
|
- group: {{ user_group }}
|
||||||
- mode: 644
|
- mode: '0644'
|
||||||
- template: jinja
|
- template: jinja
|
||||||
- source:
|
- source:
|
||||||
- salt://users/files/vimrc/{{ name }}/vimrc
|
- salt://users/files/vimrc/{{ name }}/vimrc
|
||||||
|
Loading…
Reference in New Issue
Block a user