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.

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

harden chmod of haproxy config file #272

Merged
merged 1 commit into from
Dec 23, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
concat { $_config_file:
owner => '0',
group => '0',
mode => '0644',
mode => '0640',
}

# validate_cmd introduced in Puppet 3.5
Expand Down
10 changes: 5 additions & 5 deletions spec/classes/haproxy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
subject.should contain_concat('/etc/haproxy/haproxy.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -122,7 +122,7 @@
subject.should contain_concat('/tmp/haproxy.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
end
Expand All @@ -149,7 +149,7 @@
subject.should contain_concat('/etc/haproxy/haproxy.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -221,7 +221,7 @@
subject.should contain_concat('/usr/local/etc/haproxy.conf').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -283,7 +283,7 @@
subject.should contain_concat('/usr/local/etc/haproxy.conf').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down
12 changes: 6 additions & 6 deletions spec/defines/instance_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
subject.should contain_concat('/etc/haproxy/haproxy.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -142,7 +142,7 @@
subject.should contain_concat('/etc/haproxy/haproxy.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -271,7 +271,7 @@
subject.should contain_concat('/etc/haproxy-group1/haproxy-group1.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -342,7 +342,7 @@
subject.should contain_concat('/etc/haproxy-group1/haproxy-group1.cfg').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -417,7 +417,7 @@
subject.should contain_concat('/usr/local/etc/haproxy.conf').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down Expand Up @@ -480,7 +480,7 @@
subject.should contain_concat('/usr/local/etc/haproxy.conf').with(
'owner' => '0',
'group' => '0',
'mode' => '0644'
'mode' => '0640'
)
end
it 'should manage the chroot directory' do
Expand Down