D827.diff
No OneTemporary
Actions

Size

774 B

Referenced Files

None

Subscribers

None

D827.diff
View Options

	diff --git a/pillar/users/shellusers.sls b/pillar/users/shellusers.sls
	--- a/pillar/users/shellusers.sls
	+++ b/pillar/users/shellusers.sls
	@@ -28,6 +28,11 @@
	uid: 2005
	dereckson:
	fullname: Sebastien Santoro
	+ {% if grains['os'] == 'FreeBSD' %}
	+ shell: /bin/tcsh
	+ {% else %}
	+ shell: /usr/bin/tcsh
	+ {% endif %}
	uid: 5001
	kalix:
	fullname: Yassine Hadj Messaoud
	diff --git a/roles/shellserver/users/init.sls b/roles/shellserver/users/init.sls
	--- a/roles/shellserver/users/init.sls
	+++ b/roles/shellserver/users/init.sls
	@@ -36,7 +36,7 @@
	{{user}}:
	user.present:
	- fullname: {{ args['fullname'] }}
	- - shell: /bin/bash
	+ - shell: {{ args['shell']\|default('/bin/bash') }}
	- uid: {{ args['uid'] }}
	{% endfor %}