From 13d7c271f26980286a7ae5fcf7f0dc053a178816 Mon Sep 17 00:00:00 2001
From: Wolodja Wentland <w@babilen5.org>
Date: Thu, 11 Sep 2014 16:03:14 +0100
Subject: [PATCH] Change default shell to /bin/csh on FreeBSD

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
---
 users/init.sls  | 2 +-
 users/map.jinja | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/users/init.sls b/users/init.sls
index d99ad06..2638da5 100644
--- a/users/init.sls
+++ b/users/init.sls
@@ -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 -%}
diff --git a/users/map.jinja b/users/map.jinja
index 7a0c0d3..987e22e 100644
--- a/users/map.jinja
+++ b/users/map.jinja
@@ -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',