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

Merge pull request #49 from babilen/issues/#48

Browse Source 
Change default shell to /bin/csh on FreeBSD
This commit is contained in:
Nitin Madhok 2014-09-11 11:27:49 -04:00
commit b806cc1b38
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
users/init.sls
View File

@ -40,7 +40,7 @@
user.present: user.present:
- name: {{ name }} - name: {{ name }}
- home: {{ home }} - 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 -%} {% if 'uid' in user -%}
- uid: {{ user['uid'] }} - uid: {{ user['uid'] }}
{% endif -%} {% endif -%}

4
users/map.jinja
View File

@ -4,6 +4,7 @@
'sudoers_dir': '/etc/sudoers.d/', 'sudoers_dir': '/etc/sudoers.d/',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'root_group': 'root', 'root_group': 'root',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash', 'visudo_shell': '/bin/bash',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
@ -12,6 +13,7 @@
'sudoers_dir': '/etc/sudoers.d/', 'sudoers_dir': '/etc/sudoers.d/',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'root_group': 'root', 'root_group': 'root',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash', 'visudo_shell': '/bin/bash',
'bash_package': 'app-shells/bash', 'bash_package': 'app-shells/bash',
'sudo_package': 'app-admin/sudo', 'sudo_package': 'app-admin/sudo',
@ -20,6 +22,7 @@
'sudoers_dir': '/usr/local/etc/sudoers.d/', 'sudoers_dir': '/usr/local/etc/sudoers.d/',
'sudoers_file': '/usr/local/etc/sudoers', 'sudoers_file': '/usr/local/etc/sudoers',
'root_group': 'wheel', 'root_group': 'wheel',
'shell': '/bin/csh',
'visudo_shell': '/usr/local/bin/bash', 'visudo_shell': '/usr/local/bin/bash',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',
@ -28,6 +31,7 @@
'sudoers_dir': '/etc/sudoers.d/', 'sudoers_dir': '/etc/sudoers.d/',
'sudoers_file': '/etc/sudoers', 'sudoers_file': '/etc/sudoers',
'root_group': 'root', 'root_group': 'root',
'shell': '/bin/bash',
'visudo_shell': '/bin/bash', 'visudo_shell': '/bin/bash',
'bash_package': 'bash', 'bash_package': 'bash',
'sudo_package': 'sudo', 'sudo_package': 'sudo',