mirror of
				https://github.com/saltstack-formulas/users-formula.git
				synced 2025-11-04 06:03:38 +01:00 
			
		
		
		
	Merge pull request #59 from FEI-Lithicon/master
Add support for 'expire' and stop managing home directory if createhome is set to False
This commit is contained in:
		
						commit
						a57f81a378
					
				@ -9,6 +9,7 @@ users:
 | 
			
		||||
    password: $6$w.............
 | 
			
		||||
    home: /custom/buser
 | 
			
		||||
    createhome: True
 | 
			
		||||
    expire: 16426
 | 
			
		||||
    sudouser: True
 | 
			
		||||
    sudo_rules:
 | 
			
		||||
      - ALL=(root) /usr/bin/find
 | 
			
		||||
 | 
			
		||||
@ -22,6 +22,7 @@
 | 
			
		||||
{% endfor %}
 | 
			
		||||
 | 
			
		||||
{{ name }}_user:
 | 
			
		||||
  {% if user.get('createhome', True) %}
 | 
			
		||||
  file.directory:
 | 
			
		||||
    - name: {{ home }}
 | 
			
		||||
    - user: {{ name }}
 | 
			
		||||
@ -30,6 +31,7 @@
 | 
			
		||||
    - require:
 | 
			
		||||
      - user: {{ name }}
 | 
			
		||||
      - group: {{ user_group }}
 | 
			
		||||
  {%- endif %}
 | 
			
		||||
  group.present:
 | 
			
		||||
    - name: {{ user_group }}
 | 
			
		||||
    {%- if 'prime_group' in user and 'gid' in user['prime_group'] %}
 | 
			
		||||
@ -58,6 +60,9 @@
 | 
			
		||||
    {% if not user.get('createhome', True) %}
 | 
			
		||||
    - createhome: False
 | 
			
		||||
    {% endif %}
 | 
			
		||||
    {% if 'expire' in user -%}
 | 
			
		||||
    - expire: {{ user['expire'] }}
 | 
			
		||||
    {% endif -%}
 | 
			
		||||
    - remove_groups: {{ user.get('remove_groups', 'False') }}
 | 
			
		||||
    - groups:
 | 
			
		||||
      - {{ user_group }}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user