Merge pull request #124 from atomic111/master

FIX for issue #122 non-ASCII character

metadata.rb

@@ -29,8 +29,8 @@
 supports 'redhat', '>= 5.0'
 supports 'oracle', '>= 6.4'
 
-depends 'sysctl', '>= 0.3.0'
-depends 'apt'
+depends 'sysctl', '<= 0.7.5'
+depends 'apt', '~> 3.0.0'
 depends 'yum'
 
 recipe 'os-hardening::default', 'harden the operating system (all recipes)'

spec/recipes/login_defs_spec.rb

@@ -21,8 +21,8 @@
 
   let(:chef_run) do
     ChefSpec::ServerRunner.new do |node|
-      node.set['auth']['uid_min'] = 5000
-      node.set['auth']['gid_min'] = 5000
+      node.set['os-hardening']['auth']['uid_min'] = 5000
+      node.set['os-hardening']['auth']['gid_min'] = 5000
     end.converge(described_recipe)
   end
 

spec/recipes/sysctl_spec.rb

@@ -30,7 +30,7 @@
 
     it 'should detect intel cpu' do
       intel_run.converge(described_recipe)
-      expect(intel_run.node['security']['cpu_vendor']).to eq('intel')
+      expect(intel_run.node['os-hardening']['security']['cpu_vendor']).to eq('intel')
     end
 
   end
@@ -46,7 +46,7 @@
 
     it 'should detect amd cpu' do
       amd_run.converge(described_recipe)
-      expect(amd_run.node['security']['cpu_vendor']).to eq('amd')
+      expect(amd_run.node['os-hardening']['security']['cpu_vendor']).to eq('amd')
     end
   end
 
@@ -60,7 +60,7 @@
 
     it 'should detect intel cpu' do
       fallback_run.converge(described_recipe)
-      expect(fallback_run.node['security']['cpu_vendor']).to eq('intel')
+      expect(fallback_run.node['os-hardening']['security']['cpu_vendor']).to eq('intel')
     end
   end
 end

templates/default/login.defs.erb

@@ -92,7 +92,7 @@ KILLCHAR  025
 UMASK   <%= @umask %>
 
 # Enable setting of the umask group bits to be the same as owner bits (examples: `022` -> `002`, `077` -> `007`) for non-root users, if the uid is the same as gid, and username is the same as the primary group name.
-# If set to yes, userdel will remove the user´s group if it contains no more members, and useradd will create by default a group with the name of the user.
+# If set to yes, userdel will remove the user's group if it contains no more members, and useradd will create by default a group with the name of the user.
 USERGROUPS_ENAB yes