Skip to content

Commit

Permalink
Merge pull request #71 from BillWeiss/remove-concat-setup
Browse files Browse the repository at this point in the history
Upstream says don't directly call concat::setup
  • Loading branch information
luxflux committed May 19, 2014
2 parents a234f5c + d48a41d commit 2daed6b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 0 additions & 2 deletions manifests/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
class openvpn::config {

if $::osfamily == 'Debian' {
include concat::setup

concat {
'/etc/default/openvpn':
owner => root,
Expand Down
3 changes: 1 addition & 2 deletions spec/classes/openvpn_config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
describe 'openvpn::config', :type => :class do

it { should create_class('openvpn::config') }

context "on Debian based machines" do
let (:facts) { { :osfamily => 'Debian', :concat_basedir => '/var/lib/puppet/concat' } }

it { should contain_class('concat::setup') }
it { should contain_concat('/etc/default/openvpn') }
it { should contain_concat__fragment('openvpn.default.header') }
end
Expand Down

0 comments on commit 2daed6b

Please sign in to comment.