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

Jump to bottom

Fix config permissions #90

Merged
merged 6 commits into from
Mar 8, 2018
Merged

Fix config permissions #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b9a5c7b
Fix config permissions
onlyhavecans Mar 1, 2018
ad569d3
Add regression test
onlyhavecans Mar 6, 2018
b11d8c4
Fix cop issue
onlyhavecans Mar 8, 2018
91cc28d
fix permissions
onlyhavecans Mar 8, 2018
7407d34
Use new kitchen
onlyhavecans Mar 8, 2018
8614a69
Add an OK check as well.
onlyhavecans Mar 8, 2018
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
3 changes: 2 additions & 1 deletion .kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ driver:

provisioner:
name: chef_zero
require_chef_omnibus: 13
product_name: chef
product_version: 13
# On CentOS 6, restart the 'postgres' database could fail the first time so
# let's try twice before failing:
# https://github.com/sous-chefs/postgresql/issues/421
Expand Down
16 changes: 8 additions & 8 deletions resources/authoritative_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@
property :variables, Hash, default: lazy { |resource| { bind_config: "#{resource.config_dir}/bindbackend.conf" } }

action :create do
directory new_resource.config_dir do
owner 'root'
group 'root'
mode '0755'
action :create
end

user new_resource.run_user do
home new_resource.run_user_home
shell new_resource.run_user_shell
Expand All @@ -80,11 +73,18 @@
action :create
end

directory new_resource.config_dir do
owner 'root'
group new_resource.run_group
mode '0755'
action :create
end

template "#{new_resource.config_dir}/#{authoritative_instance_config(new_resource.instance_name)}" do
source new_resource.source
cookbook new_resource.cookbook
owner 'root'
group 'root'
group new_resource.run_group
mode '0640'
variables(
launch: new_resource.launch,
Expand Down
16 changes: 8 additions & 8 deletions resources/recursor_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,6 @@
property :variables, Hash, default: {}

action :create do
directory new_resource.config_dir do
owner 'root'
group 'root'
mode '0755'
action :create
end

user new_resource.run_user do
home new_resource.run_user_home
shell new_resource.run_user_shell
Expand All @@ -79,11 +72,18 @@
action :create
end

directory new_resource.config_dir do
owner 'root'
group new_resource.run_group
mode '0755'
action :create
end

template "#{new_resource.config_dir}/#{recursor_instance_config(new_resource.instance_name)}" do
source new_resource.source
cookbook new_resource.cookbook
owner 'root'
group 'root'
group new_resource.run_group
mode '0640'
variables(
socket_dir: new_resource.socket_dir,
Expand Down
8 changes: 8 additions & 0 deletions test/integration/recursor-multi/default_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,11 @@
describe command('dig -p 54 @127.0.0.1 dnsimple.com') do
its('stdout') { should match(Regexp.new(/\d+\.\d+\.\d+\.\d+/)) }
end

## Regression test for https://github.com/dnsimple/chef-pdns/issues/89
describe command('rec_control --config-name=server_02 --socket-dir=/var/run/server_02 reload-zones') do
its('stdout') { should match('ok') }
its('stdout') { should_not match('unable to parse configuration file') }
its('stdout') { should_not match('Encountered error reloading zones, keeping original data: Unable to re-parse configuration file') }
its('exit_status') { should eq 0 }
end