From d33b4e135dea76698a96d64240445ae2754a77df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20O=CC=88rnstedt?= <jan.ornstedt@postkodlotteriet.se>
Date: Mon, 16 Jun 2014 16:55:37 +0200
Subject: [PATCH] Change nx_conf_dir to config::conf_dir to make it possible to
 configure via parameter.

---
 manifests/resource/geo.pp         | 2 +-
 manifests/resource/map.pp         | 2 +-
 spec/defines/resource_geo_spec.rb | 1 +
 spec/defines/resource_map_spec.rb | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

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