Merge pull request #339 from janorn/small_fix_337

Change nx_conf_dir to config::conf_dir

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

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

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
 

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