From 26097197ca8608a25159d02f5fb5eaaf5d311488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Fri, 9 Jun 2017 16:43:26 +0200 Subject: [PATCH] Don't create users and rewrite the sudo config in dev environment It breaks the vagrant user --- site-cookbooks/kosmos-base/recipes/default.rb | 36 ++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/site-cookbooks/kosmos-base/recipes/default.rb b/site-cookbooks/kosmos-base/recipes/default.rb index 7bfd967..25704cd 100644 --- a/site-cookbooks/kosmos-base/recipes/default.rb +++ b/site-cookbooks/kosmos-base/recipes/default.rb @@ -19,23 +19,27 @@ end package 'mailutils' package 'mosh' -# Searches data bag "users" for groups attribute "sysadmin". -# Places returned users in Unix group "sysadmin" with GID 2300. -users_manage 'sysadmin' do - group_id 2300 - action [:remove, :create] -end +# Don't create users and rewrite the sudo config in development environment. +# It breaks the vagrant user +unless node.chef_environment == "development" + # Searches data bag "users" for groups attribute "sysadmin". + # Places returned users in Unix group "sysadmin" with GID 2300. + users_manage 'sysadmin' do + group_id 2300 + action [:remove, :create] + end -node.override['authorization']['sudo']['sudoers_defaults'] = [ - # not default on Ubuntu, explicitely enable. Uses a minimal white list of - # environment variables - 'env_reset', - # Send emails on unauthorized attempts - 'mail_badpass', - 'secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"', -] -node.override['authorization']['sudo']['passwordless'] = true -include_recipe 'sudo' + node.override['authorization']['sudo']['sudoers_defaults'] = [ + # not default on Ubuntu, explicitely enable. Uses a minimal white list of + # environment variables + 'env_reset', + # Send emails on unauthorized attempts + 'mail_badpass', + 'secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin"', + ] + node.override['authorization']['sudo']['passwordless'] = true + include_recipe 'sudo' +end include_recipe 'kosmos-postfix'