use nx_conf_dir for nginx configuration path

This commit is contained in:
Carl P. Corliss 2014-06-13 10:05:30 -04:00
parent d3810eb61c
commit 198d326eb0
4 changed files with 28 additions and 2 deletions

View file

@ -79,7 +79,7 @@ define nginx::resource::geo (
mode => '0644', mode => '0644',
} }
file { "/etc/nginx/conf.d/${name}-geo.conf": file { "${nginx::params::nx_conf_dir}/conf.d/${name}-geo.conf":
ensure => $ensure ? { ensure => $ensure ? {
'absent' => absent, 'absent' => absent,
default => 'file', default => 'file',

View file

@ -63,7 +63,7 @@ define nginx::resource::map (
mode => '0644', mode => '0644',
} }
file { "/etc/nginx/conf.d/${name}-map.conf": file { "${nginx::params::nx_conf_dir}/conf.d/${name}-map.conf":
ensure => $ensure ? { ensure => $ensure ? {
'absent' => absent, 'absent' => absent,
default => 'file', default => 'file',

View file

@ -17,6 +17,19 @@ describe 'nginx::resource::geo' do
} }
end end
let :facts do
{
:osfamily => 'RedHat',
:operatingsystem => 'CentOS',
}
end
let :pre_condition do
[
'include ::nginx::params',
]
end
describe 'os-independent items' do describe 'os-independent items' do
describe 'basic assumptions' do describe 'basic assumptions' do
let :params do default_params end let :params do default_params end

View file

@ -17,6 +17,19 @@ describe 'nginx::resource::map' do
} }
end end
let :facts do
{
:osfamily => 'RedHat',
:operatingsystem => 'CentOS',
}
end
let :pre_condition do
[
'include ::nginx::params',
]
end
describe 'os-independent items' do describe 'os-independent items' do
describe 'basic assumptions' do describe 'basic assumptions' do
let :params do default_params end let :params do default_params end