saltstack-formulas/users-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #102 from 0xf10e/mitigate_salt_29004

Browse Source 
Mitigate Salt issue #29004, fixes "expire" on *BSD
This commit is contained in:
puneet kandhari 2015-11-18 09:42:19 -06:00
commit a93f97fb3d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
users/init.sls
View File

@ -113,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: