Browse Source

fix(user): Better 'default_user' creation

- Only use the first key of node['default_user']

Signed-off-by: Jeremy MAURO <jeremy.mauro@gmail.com>
Jeremy MAURO 3 years ago
parent
commit
9055c270f9
2 changed files with 14 additions and 13 deletions
  1. 1 0
      base.rb
  2. 13 13
      cookbooks/workstation/recipes/_git.rb

+ 1 - 0
base.rb

@@ -36,4 +36,5 @@ cookbook 'resolver', git: 'https://github.com/jmauro/resolver', branch: 'atomic_
 default['my_workstation']['default_user']['jeremy'] = {
   'home': '/home/jeremy',
   'shell': '/bin/bash',
+  'manage_home': true,
 }

+ 13 - 13
cookbooks/workstation/recipes/_git.rb

@@ -4,21 +4,22 @@
 #
 # Copyright:: 2022, The Authors, All Rights Reserved.
 
-node['my_workstation']['default_user'].each do |username, properties|
-  user username do
-    properties.each do |property, value|
-      send(property, value)
-    end
-    manage_home true
+include_recipe 'git'
+
+username, properties = node['my_workstation']['default_user'].first
+user username do
+  properties.each do |property, value|
+    send(property, value)
   end
+end
 
-  user_repo_directory = ::File.join(properties['home'], 'repo')
+user_repo_directory = ::File.join(properties['home'], 'repo')
 
-  directory user_repo_directory do
-    owner username
-    group username
-    recursive true
-  end
+directory user_repo_directory do
+  owner username
+  group username
+  recursive true
+end
 
   include_recipe 'git'
 
@@ -37,4 +38,3 @@ node['my_workstation']['default_user'].each do |username, properties|
     end
   end
 end
-