Merge pull request #171 from noelmcloughlin/darwin

sudo already installed on Darwin
This commit is contained in:
Niels Abspoel 2018-03-17 21:29:00 +01:00 committed by GitHub
commit 78d85bca79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 0 deletions

View File

@ -1,5 +1,16 @@
# 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',
@ -56,3 +67,8 @@
'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 %}

View File

@ -11,6 +11,7 @@ users_sudo-package:
- 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: