Browse Source

Merge pull request #222 from jasonious/style-fix

style: quote numbers and file modes
tags/v0.48.6
Imran Iqbal 4 years ago
parent
commit
21fb2bfbd7
No account linked to committer's email address
5 changed files with 13 additions and 13 deletions
  1. +1
    -1
      users/bashrc.sls
  2. +1
    -1
      users/googleauth.sls
  3. +9
    -9
      users/init.sls
  4. +1
    -1
      users/profile.sls
  5. +1
    -1
      users/vimrc.sls

+ 1
- 1
users/bashrc.sls View File

- 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

+ 1
- 1
users/googleauth.sls View File

- 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 %}

+ 9
- 9
users/init.sls View File

- user: {{ name }} - user: {{ name }}
- group: {{ user_group }} - group: {{ user_group }}
- makedirs: True - makedirs: True
- mode: 700
- dir_mode: 700
- mode: '0700'
- dir_mode: '0700'
- require: - require:
- user: {{ name }} - user: {{ name }}
- group: {{ user_group }} - group: {{ user_group }}
- 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) %}
- 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 -%}
- 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:
- 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:
- 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
- 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 %}

+ 1
- 1
users/profile.sls View File

- 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

+ 1
- 1
users/vimrc.sls View File

- 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…
Cancel
Save