diff --git a/Modulefile b/Modulefile index 5e5a2f1..883abc0 100644 --- a/Modulefile +++ b/Modulefile @@ -9,3 +9,4 @@ project_page 'http://github.com/jfryman/puppet-nginx' dependency 'puppetlabs/stdlib', '>= 0.1.6' dependency 'puppetlabs/apt', '>= 1.0.0' +dependency 'puppetlabs/concat', '>= 1.0.0' diff --git a/Puppetfile b/Puppetfile index 7edb487..7a314f2 100644 --- a/Puppetfile +++ b/Puppetfile @@ -2,3 +2,4 @@ forge 'http://forge.puppetlabs.com' mod 'puppetlabs/stdlib', '>=0.1.6' mod 'puppetlabs/apt', '>=1.0.0' +mod 'puppetlabs/concat', '>=1.0.0' diff --git a/Puppetfile.lock b/Puppetfile.lock index 47783d2..aac666e 100644 --- a/Puppetfile.lock +++ b/Puppetfile.lock @@ -3,9 +3,11 @@ FORGE specs: puppetlabs/apt (1.2.0) puppetlabs/stdlib (>= 2.2.1) + puppetlabs/concat (1.0.0) puppetlabs/stdlib (4.1.0) DEPENDENCIES puppetlabs/apt (>= 1.0.0) + puppetlabs/concat (>= 1.0.0) puppetlabs/stdlib (>= 0.1.6) diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb index 44ccf3a..3f6e7f7 100644 --- a/spec/classes/nginx_spec.rb +++ b/spec/classes/nginx_spec.rb @@ -16,6 +16,7 @@ describe 'nginx' do :operatingsystem => 'Debian', :osfamily => 'Debian', :lsbdistcodename => 'precise', + :concat_basedir => '/var/lib/puppet/concat', } end @@ -34,6 +35,7 @@ describe 'nginx' do :kernel => 'linux', :operatingsystem => 'RedHat', :osfamily => 'RedHat', + :concat_basedir => '/var/lib/puppet/concat', } end @@ -52,6 +54,7 @@ describe 'nginx' do :kernel => 'linux', :operatingsystem => 'SuSE', :osfamily => 'Suse', + :concat_basedir => '/var/lib/puppet/concat', } end diff --git a/spec/defines/resource_location_spec.rb b/spec/defines/resource_location_spec.rb index 8d6e347..f445f9c 100644 --- a/spec/defines/resource_location_spec.rb +++ b/spec/defines/resource_location_spec.rb @@ -9,6 +9,7 @@ describe 'nginx::resource::location' do :osfamily => 'Debian', :operatingsystem => 'debian', :kernel => 'Linux', + :concat_basedir => '/var/lib/puppet/concat', } end let :pre_condition do diff --git a/spec/defines/resource_mailhost_spec.rb b/spec/defines/resource_mailhost_spec.rb index 943e26a..1a73030 100644 --- a/spec/defines/resource_mailhost_spec.rb +++ b/spec/defines/resource_mailhost_spec.rb @@ -10,6 +10,7 @@ describe 'nginx::resource::mailhost' do :operatingsystem => 'debian', :kernel => 'Linux', :ipaddress6 => '::', + :concat_basedir => '/var/lib/puppet/concat', } end let :default_params do diff --git a/spec/defines/resource_upstream_spec.rb b/spec/defines/resource_upstream_spec.rb index d12a9cc..7e54fcc 100644 --- a/spec/defines/resource_upstream_spec.rb +++ b/spec/defines/resource_upstream_spec.rb @@ -5,6 +5,10 @@ describe 'nginx::resource::upstream' do 'upstream-test' end + let :facts do { + :concat_basedir => '/var/lib/puppet/concat', + } end + let :default_params do { :members => ['test'], diff --git a/spec/defines/resource_vhost_spec.rb b/spec/defines/resource_vhost_spec.rb index ccf75fc..dd1c0c2 100644 --- a/spec/defines/resource_vhost_spec.rb +++ b/spec/defines/resource_vhost_spec.rb @@ -16,6 +16,7 @@ describe 'nginx::resource::vhost' do :operatingsystem => 'debian', :kernel => 'Linux', :ipaddress6 => '::', + :concat_basedir => '/var/lib/puppet/concat', } end let :pre_condition do diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb index e16374a..aceafba 100644 --- a/spec/spec_helper_system.rb +++ b/spec/spec_helper_system.rb @@ -21,6 +21,7 @@ RSpec.configure do |c| puppet_module_install(:source => proj_root, :module_name => 'nginx') shell('puppet module install puppetlabs-apt') shell('puppet module install puppetlabs-stdlib') + shell('puppet module install puppetlabs-concat') # Fake keys. # Valid self-signed SSL key with 10 year expiry.