Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2024-11-28 02:57:55 +01:00
Code Issues Activity

Merge pull request #5 from saltstack-formulas/master

Browse Source 
Pull changes from main repo.
This commit is contained in:
Roman 2015-12-25 00:50:58 +03:00
commit 6e3c771b52
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
users/init.sls
View File

@ -48,9 +48,11 @@ include:
{% for group in user.get('groups', []) %} {% for group in user.get('groups', []) %}
users_{{ name }}_{{ group }}_group: users_{{ name }}_{{ group }}_group:
group: group.present:
- name: {{ group }} - name: {{ group }}
- present {% if group == 'sudo' %}
- system: True
{% endif %}
{% endfor %} {% endfor %}
users_{{ name }}_user: users_{{ name }}_user:
@ -111,7 +113,17 @@ users_{{ name }}_user:
- createhome: False - createhome: False
{% endif %} {% endif %}
{% if 'expire' in user -%} {% if 'expire' in user -%}
{% if grains['kernel'].endswith('BSD') and
user['expire'] < 157766400 %}
{# 157762800s since epoch equals 01 Jan 1975 00:00:00 UTC #}
- expire: {{ user['expire'] * 86400 }}
{% elif grains['kernel'] == 'Linux' and
user['expire'] > 84006 %}
{# 2932896 days since epoch equals 9999-12-31 #}
- expire: {{ (user['expire'] / 86400) | int}}
{% else %}
- expire: {{ user['expire'] }} - expire: {{ user['expire'] }}
{% endif %}
{% endif -%} {% endif -%}
- remove_groups: {{ user.get('remove_groups', 'False') }} - remove_groups: {{ user.get('remove_groups', 'False') }}
- groups: - groups:
@ -183,7 +195,7 @@ users_authorized_keys_{{ name }}:
file.managed: file.managed:
- name: {{ home }}/.ssh/authorized_keys - name: {{ home }}/.ssh/authorized_keys
- user: {{ name }} - user: {{ name }}
- group: {{ name }} - group: {{ user_group }}
- mode: 600 - mode: 600
{% if 'ssh_auth_file' in user %} {% if 'ssh_auth_file' in user %}
- contents: | - contents: |

6
users/sudo.sls
View File

@ -6,16 +6,10 @@ users_bash-package:
pkg.installed: pkg.installed:
- name: {{ users.bash_package }} - name: {{ users.bash_package }}
users_sudo-group:
group.present:
- name: sudo
- system: True
users_sudo-package: users_sudo-package:
pkg.installed: pkg.installed:
- name: {{ users.sudo_package }} - name: {{ users.sudo_package }}
- require: - require:
- group: users_sudo-group
- file: {{ users.sudoers_dir }} - file: {{ users.sudoers_dir }}
users_{{ users.sudoers_dir }}: users_{{ users.sudoers_dir }}: