Browse Source

corrected users handling on Darwin

tags/v0.45.0
noelmcloughlin 6 years ago
parent
commit
ad10ec4d94
2 changed files with 17 additions and 0 deletions
  1. +16
    -0
      users/map.jinja
  2. +1
    -0
      users/sudo.sls

+ 16
- 0
users/map.jinja View File

# vim: sts=2 ts=2 sw=2 et ai # vim: sts=2 ts=2 sw=2 et ai

{% set users = salt['grains.filter_by']({ {% set users = salt['grains.filter_by']({
'MacOS': {
'sudoers_dir': '/etc/sudoers.d',
'sudoers_file': '/etc/sudoers',
'googleauth_dir': '/etc/google_authenticator.d',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash',
'bash_package': 'bash',
'sudo_package': 'sudo',
'googleauth_package': 'google-authenticator-libpam',
},
'Debian': { 'Debian': {
'sudoers_dir': '/etc/sudoers.d', 'sudoers_dir': '/etc/sudoers.d',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
}, },
}, merge=salt['pillar.get']('users-formula:lookup')) %} }, merge=salt['pillar.get']('users-formula:lookup')) %}

{% if grains.os == 'MacOS' %}
{% set group = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
{% do users.update({'root_group': group,}) %}
{% endif %}

+ 1
- 0
users/sudo.sls View File

- name: {{ users.sudo_package }} - name: {{ users.sudo_package }}
- require: - require:
- file: {{ users.sudoers_dir }} - file: {{ users.sudoers_dir }}
- unless: test "`uname`" = "Darwin"


users_{{ users.sudoers_dir }}: users_{{ users.sudoers_dir }}:
file.directory: file.directory:

Loading…
Cancel
Save