Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2026-05-14 04:20:33 +02:00
Code Issues Activity

fix polkit settings to write all users in one file

Browse Source
This commit is contained in:
Maximilian Zettler 2017-01-22 12:43:38 +01:00
parent 1f509a9a7f
commit e2360c89f4
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
users/init.sls
View File

@ -22,6 +22,7 @@
{%- if used_sudo or used_googleauth or used_user_files %} {%- if used_sudo or used_googleauth or used_user_files %}
include: include:
- users.polkit
{%- if used_sudo %} {%- if used_sudo %}
- users.sudo - users.sudo
{%- endif %} {%- endif %}
@ -415,27 +416,6 @@ users_{{ users.sudoers_dir }}/{{ name }}:
- name: {{ users.sudoers_dir }}/{{ name }} - name: {{ users.sudoers_dir }}/{{ name }}
{% endif %} {% endif %}
# Policykit AdminIdentities Logik
{%- if 'polkitadmin' in user and user['polkitadmin'] %}
users_{{ users.polkit_dir }}/{{ name }}:
file.managed:
- replace: True
- onlyif: 'test -d {{ users.polkit_dir }}'
- name: {{ users.polkit_dir }}/{{ name }}.conf
- contents: |
########################################################################
# File managed by Salt (users-formula).
# Your changes will be overwritten.
########################################################################
#
[Configuration]
AdminIdentities=unix-user:{{ name }}
{%- else %}
users_{{ users.polkit_dir }}/{{ name }}:
file.absent:
- name: {{ users.polkit_dir }}/{{ name }}.conf
{%- endif %}
{%- if 'google_auth' in user %} {%- if 'google_auth' in user %}
{%- for svc in user['google_auth'] %} {%- for svc in user['google_auth'] %}
users_googleauth-{{ svc }}-{{ name }}: users_googleauth-{{ svc }}-{{ name }}:
@ -505,9 +485,6 @@ users_absent_user_{{ name }}:
users_{{ users.sudoers_dir }}/{{ name }}: users_{{ users.sudoers_dir }}/{{ name }}:
file.absent: file.absent:
- name: {{ users.sudoers_dir }}/{{ name }} - name: {{ users.sudoers_dir }}/{{ name }}
users_{{ users.polkit_dir }}/{{ name }}:
file.absent:
- name: {{ users.polkit_dir }}/{{ name }}.conf
{% endfor %} {% endfor %}
{% for user in pillar.get('absent_users', []) %} {% for user in pillar.get('absent_users', []) %}
@ -517,9 +494,6 @@ users_absent_user_2_{{ user }}:
users_2_{{ users.sudoers_dir }}/{{ user }}: users_2_{{ users.sudoers_dir }}/{{ user }}:
file.absent: file.absent:
- name: {{ users.sudoers_dir }}/{{ user }} - name: {{ users.sudoers_dir }}/{{ user }}
users_2_{{ users.polkit_dir }}/{{ name }}:
file.absent:
- name: {{ users.polkit_dir }}/{{ name }}.conf
{% endfor %} {% endfor %}
{% for group in pillar.get('absent_groups', []) %} {% for group in pillar.get('absent_groups', []) %}

32
users/polkit.sls Normal file
View File

@ -0,0 +1,32 @@
{% from "users/map.jinja" import users with context %}
{% set polkitusers = {} %}
{% set polkitusers = {'value': ''} %}
{% for name, user in pillar.get('users', {}).items() %}
{% if user.absent is not defined or not user.absent %}
{% if 'polkitadmin' in user and user['polkitadmin'] %}
{% if polkitusers.update({'value': polkitusers.value + 'unix-user:' + name + ';'}) %}
{% endif %}
{% endif %}
{% endif %}
{% endfor %}
{% if polkitusers.value != '' %}
users_{{ users.polkit_dir }}/99salt-users-formula.conf:
file.managed:
- replace: True
- onlyif: 'test -d {{ users.polkit_dir }}'
- name: {{ users.polkit_dir }}/99salt-users-formula.conf
- contents: |
########################################################################
# File managed by Salt (users-formula).
# Your changes will be overwritten.
########################################################################
#
[Configuration]
AdminIdentities={{ polkitusers.value }}
{% else %}
users_{{ users.polkit_dir }}/99salt-users-formula.conf_delete:
file.absent:
- name: {{ users.polkit_dir }}/99salt-users-formula.conf
{% endif %}