Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
users-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
users-formula
Commits
b806cc1b
Commit
b806cc1b
authored
10 years ago
by
Nitin Madhok
Browse files
Options
Downloads
Plain Diff
Merge pull request #49 from babilen/issues/#48
Change default shell to /bin/csh on FreeBSD
parents
f2e98a5b
13d7c271
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
users/init.sls
+1
-1
1 addition, 1 deletion
users/init.sls
users/map.jinja
+4
-0
4 additions, 0 deletions
users/map.jinja
with
5 additions
and
1 deletion
users/init.sls
+
1
−
1
View file @
b806cc1b
...
...
@@ -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 -%}
...
...
This diff is collapsed.
Click to expand it.
users/map.jinja
+
4
−
0
View file @
b806cc1b
...
...
@@ -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',
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment