Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX for issue #122 non-ASCII character #124

Merged
merged 3 commits into from
Jul 25, 2016
Merged

FIX for issue #122 non-ASCII character #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7d4a58
FIX for issue #122 non-ASCII character
atomic111 Jul 18, 2016
dda2e63
FIX for the first rspec failure #121
atomic111 Jul 18, 2016
954c08b
FIX: for the last 3 rspec errors #121
atomic111 Jul 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down
4 changes: 2 additions & 2 deletions spec/recipes/login_defs_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions spec/recipes/sysctl_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion templates/default/login.defs.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down