Browse Source

Merge pull request #12 from madflojo/master

Cleaned up Documentation and User state
lookup-fix-3
Seth House 10 years ago
parent
commit
43eef81f77
2 changed files with 26 additions and 8 deletions
  1. +19
    -3
      pillar.example
  2. +7
    -5
      users/init.sls

+ 19
- 3
pillar.example View File

users: users:
## Minimal required pillar values
auser: auser:
sudouser: True
shell: /bin/zsh
groups: groups:
- admin - admin

## Full list of pillar values
buser:
fullname: B User
sudouser: True
sudo_rules:
- buser ALL=(root) /usr/bin/find
- buser ALL=(otheruser) /usr/bin/script.sh
shell: /bin/bash
prime_group:
name: primarygroup
gid: 500
groups:
- users
ssh_keys:
privkey: PRIVATEKEY
pubkey: PUBLICKEY
ssh_auth: ssh_auth:
- ssh-rsa PUBLICKEYKEYKEY
- ssh-rsa: PUBLICKEYKEYKEY


absent_users: absent_users:
- donald - donald

+ 7
- 5
users/init.sls View File

- group: {{ group }} - group: {{ group }}
{%- endfor %} {%- endfor %}


{% if 'privkey' in user %}
{% if 'ssh_keys' in user %}
user_{{ name }}_private_key: user_{{ name }}_private_key:
file.managed: file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/id_rsa - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/id_rsa
- user: {{ name }} - user: {{ name }}
- group: {{ user_group }} - group: {{ user_group }}
- mode: 600 - mode: 600
- source: salt://keys/{{ user['privkey'] }}
- contents: {{ user['ssh_keys']['privkey'] }}
- require: - require:
- user: {{ name }}_user - user: {{ name }}_user
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
file.managed: file.managed:
- name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/id_rsa.pub - name: {{ user.get('home', '/home/{0}'.format(name)) }}/.ssh/id_rsa.pub
- user: {{ name }} - user: {{ name }}
- group: {{ name }}
- group: {{ user_group }}
- mode: 644 - mode: 644
- source: salt://keys/{{ user['privkey'] }}.pub
- contents: {{ user['ssh_keys']['pubkey'] }}
- require: - require:
- user: {{ name }}_user - user: {{ name }}_user
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
/etc/sudoers.d/{{ name }}: /etc/sudoers.d/{{ name }}:
file.append: file.append:
- text: - text:
- "{{ name }} ALL=(ALL) NOPASSWD: ALL"
{% for rule in user.get('sudo_rules', []) %}
- {{ rule }}
{% endfor %}
- require: - require:
- file: sudoer-defaults - file: sudoer-defaults
- file: sudoer-{{ name }} - file: sudoer-{{ name }}

Loading…
Cancel
Save