Salt/users-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/users-formula.git synced 2026-08-01 22:35:09 +02:00
Code Issues Activity

Change default shell to /bin/csh on FreeBSD

Browse Source 
This also made it necessary to introduce an additional entry 'shell' into the
users lookup table as the formula previously conflated the shell used for
running the visudo command and the default shell to be used for user accounts.

Fixes: #48
This commit is contained in:
Wolodja Wentland
2014-09-11 16:06:43 +01:00
parent f2e98a5b53
commit 13d7c271f2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
users/init.sls
+1 -1
View File
@@ -40,7 +40,7 @@
user.present:
- name: {{ name }}
- home: {{ home }}
- shell: {{ user.get('shell', users.get('visudo_shell', '/bin/bash')) }}
- shell: {{ user.get('shell', users.get('shell', '/bin/bash')) }}
{% if 'uid' in user -%}
- uid: {{ user['uid'] }}
{% endif -%}
users/map.jinja
+4
View File
@@ -4,6 +4,7 @@
'sudoers_dir': '/etc/sudoers.d/',
'sudoers_file': '/etc/sudoers',
'root_group': 'root',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash',
'bash_package': 'bash',
'sudo_package': 'sudo',
@@ -12,6 +13,7 @@
'sudoers_dir': '/etc/sudoers.d/',
'sudoers_file': '/etc/sudoers',
'root_group': 'root',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash',
'bash_package': 'app-shells/bash',
'sudo_package': 'app-admin/sudo',
@@ -20,6 +22,7 @@
'sudoers_dir': '/usr/local/etc/sudoers.d/',
'sudoers_file': '/usr/local/etc/sudoers',
'root_group': 'wheel',
'shell': '/bin/csh',
'visudo_shell': '/usr/local/bin/bash',
'bash_package': 'bash',
'sudo_package': 'sudo',
@@ -28,6 +31,7 @@
'sudoers_dir': '/etc/sudoers.d/',
'sudoers_file': '/etc/sudoers',
'root_group': 'root',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash',
'bash_package': 'bash',
'sudo_package': 'sudo',