opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #339 from janorn/small_fix_337

Browse source 
Change nx_conf_dir to config::conf_dir
This commit is contained in:
James Fryman 2014-06-16 11:32:45 -05:00
commit 74ec40739d
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/resource/geo.pp
View file

@ -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',

2
manifests/resource/map.pp
View file

@ -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',

1
spec/defines/resource_geo_spec.rb
View file

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

1
spec/defines/resource_map_spec.rb
View file

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