Change nx_conf_dir to config::conf_dir to make it possible to configure via parameter.

This commit is contained in:
Jan Örnstedt 2014-06-16 16:55:37 +02:00
parent 03094eabe5
commit d33b4e135d
4 changed files with 4 additions and 2 deletions

View file

@ -79,7 +79,7 @@ define nginx::resource::geo (
mode => '0644', 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 ? { 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 { "${nginx::params::nx_conf_dir}/conf.d/${name}-map.conf": file { "${nginx::config::conf_dir}/conf.d/${name}-map.conf":
ensure => $ensure ? { ensure => $ensure ? {
'absent' => absent, 'absent' => absent,
default => 'file', default => 'file',

View file

@ -27,6 +27,7 @@ describe 'nginx::resource::geo' do
let :pre_condition do let :pre_condition do
[ [
'include ::nginx::params', 'include ::nginx::params',
'include ::nginx::config',
] ]
end end

View file

@ -27,6 +27,7 @@ describe 'nginx::resource::map' do
let :pre_condition do let :pre_condition do
[ [
'include ::nginx::params', 'include ::nginx::params',
'include ::nginx::config',
] ]
end end