Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2025-03-03 18:44:33 +01:00
Code Issues Activity

add polkir AdminIdentities default system configs

Browse Source
This commit is contained in:
Maximilian Zettler 2017-01-23 10:36:49 +01:00
parent 18690da4a3
commit 1463f65e6b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
users/map.jinja
View File

@ -11,6 +11,7 @@
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
'polkit_dir': '/etc/polkit-1/localauthority.conf.d', 'polkit_dir': '/etc/polkit-1/localauthority.conf.d',
'polkit_defaults': 'unix-group:sudo;'
}, },
'Gentoo': { 'Gentoo': {
'sudoers_dir': '/etc/sudoers.d', 'sudoers_dir': '/etc/sudoers.d',
@ -45,5 +46,6 @@
'sudo_package': 'sudo', 'sudo_package': 'sudo',
'googleauth_package': 'libpam-google-authenticator', 'googleauth_package': 'libpam-google-authenticator',
'polkit_dir': '/etc/polkit-1/localauthority.conf.d', 'polkit_dir': '/etc/polkit-1/localauthority.conf.d',
'polkit_defaults': 'unix-group:sudo;'
}, },
}, merge=salt['pillar.get']('users:lookup')) %} }, merge=salt['pillar.get']('users:lookup')) %}

2
users/polkit.sls
View File

@ -24,7 +24,7 @@ users_{{ users.polkit_dir }}/99salt-users-formula.conf:
######################################################################## ########################################################################
# #
[Configuration] [Configuration]
AdminIdentities={{ polkitusers.value }} AdminIdentities={{ users.polkit_defaults }}{{ polkitusers.value }}
{% else %} {% else %}
users_{{ users.polkit_dir }}/99salt-users-formula.conf_delete: users_{{ users.polkit_dir }}/99salt-users-formula.conf_delete:
file.absent: file.absent: