Skip to content

Commit

Permalink
Merge pull request #1104 from wyardley/issues_1103
Browse files Browse the repository at this point in the history
Ensure absent on concat resource for server resource with ensure => absent (#1103)
  • Loading branch information
alexjfisher authored Aug 7, 2017
2 parents f468cd2 + 7d368f5 commit a7f0921
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions manifests/resource/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@
}

concat { $config_file:
ensure => $ensure,
owner => $owner,
group => $group,
mode => $mode,
Expand Down
1 change: 1 addition & 0 deletions spec/defines/resource_server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,7 @@

it { is_expected.to contain_nginx__resource__location("#{title}-default").with_ensure('absent') }
it { is_expected.to contain_file("#{title}.conf symlink").with_ensure('absent') }
it { is_expected.to contain_concat("/etc/nginx/sites-available/#{title}.conf").with_ensure('absent') }
end

context 'when ssl => true and ssl_port == listen_port' do
Expand Down

0 comments on commit a7f0921

Please sign in to comment.