diff --git a/manifests/resource/geo.pp b/manifests/resource/geo.pp index 6f91bb6..73207cf 100644 --- a/manifests/resource/geo.pp +++ b/manifests/resource/geo.pp @@ -79,7 +79,7 @@ define nginx::resource::geo ( mode => '0644', } - file { "${nginx::params::nx_conf_dir}/conf.d/${name}-geo.conf": + file { "${nginx::config::conf_dir}/conf.d/${name}-geo.conf": ensure => $ensure ? { 'absent' => absent, default => 'file', diff --git a/manifests/resource/map.pp b/manifests/resource/map.pp index a806651..64728ec 100644 --- a/manifests/resource/map.pp +++ b/manifests/resource/map.pp @@ -63,7 +63,7 @@ define nginx::resource::map ( mode => '0644', } - file { "${nginx::params::nx_conf_dir}/conf.d/${name}-map.conf": + file { "${nginx::config::conf_dir}/conf.d/${name}-map.conf": ensure => $ensure ? { 'absent' => absent, default => 'file', diff --git a/spec/defines/resource_geo_spec.rb b/spec/defines/resource_geo_spec.rb index f7aa3ee..81c7005 100644 --- a/spec/defines/resource_geo_spec.rb +++ b/spec/defines/resource_geo_spec.rb @@ -27,6 +27,7 @@ describe 'nginx::resource::geo' do let :pre_condition do [ 'include ::nginx::params', + 'include ::nginx::config', ] end diff --git a/spec/defines/resource_map_spec.rb b/spec/defines/resource_map_spec.rb index 4e84381..e8aa50c 100644 --- a/spec/defines/resource_map_spec.rb +++ b/spec/defines/resource_map_spec.rb @@ -27,6 +27,7 @@ describe 'nginx::resource::map' do let :pre_condition do [ 'include ::nginx::params', + 'include ::nginx::config', ] end