diff --git a/manifests/globals.pp b/manifests/globals.pp
index 413339aa..d28304a8 100644
--- a/manifests/globals.pp
+++ b/manifests/globals.pp
@@ -2,6 +2,7 @@
 class puppetdb::globals (
   $version                      = 'present',
   $database                     = 'postgres',
+  Stdlib::Absolutepath $puppet_confdir = $settings::confdir,
   ) {
 
   if !(fact('os.family') in ['RedHat', 'Suse', 'Archlinux', 'Debian', 'OpenBSD', 'FreeBSD']) {
diff --git a/manifests/params.pp b/manifests/params.pp
index 456f7b4b..a57afa7f 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -91,21 +91,21 @@
         $etcdir                 = '/etc/puppetdb'
         $vardir                 = '/var/lib/puppetdb'
         $database_embedded_path = "${vardir}/db/db"
-        $puppet_confdir         = pick($settings::confdir,'/etc/puppet')
+        $puppet_confdir         = pick($puppetdb::globals::puppet_confdir,'/etc/puppet')
         $puppet_service_name    = 'puppetmaster'
       }
       'OpenBSD': {
         $etcdir                 = '/etc/puppetdb'
         $vardir                 = '/var/db/puppetdb'
         $database_embedded_path = "${vardir}/db/db"
-        $puppet_confdir         = pick($settings::confdir,'/etc/puppet')
+        $puppet_confdir         = pick($puppetdb::globals::puppet_confdir,'/etc/puppet')
         $puppet_service_name    = 'puppetmasterd'
       }
       'FreeBSD': {
         $etcdir                 = '/usr/local/etc/puppetdb'
         $vardir                 = '/var/db/puppetdb'
         $database_embedded_path = "${vardir}/db/db"
-        $puppet_confdir         = pick($settings::confdir,'/usr/local/etc/puppet')
+        $puppet_confdir         = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppet')
         $puppet_service_name    = 'puppetmaster'
       }
       default: {
@@ -118,17 +118,17 @@
     case fact('os.family') {
       'RedHat', 'Suse', 'Archlinux','Debian': {
         $etcdir              = '/etc/puppetlabs/puppetdb'
-        $puppet_confdir      = pick($settings::confdir,'/etc/puppetlabs/puppet')
+        $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
         $puppet_service_name = 'puppetserver'
       }
       'OpenBSD': {
         $etcdir              = '/etc/puppetlabs/puppetdb'
-        $puppet_confdir      = pick($settings::confdir,'/etc/puppetlabs/puppet')
+        $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/etc/puppetlabs/puppet')
         $puppet_service_name = undef
       }
       'FreeBSD': {
         $etcdir              = '/usr/local/etc/puppetlabs/puppetdb'
-        $puppet_confdir      = pick($settings::confdir,'/usr/local/etc/puppetlabs/puppet')
+        $puppet_confdir      = pick($puppetdb::globals::puppet_confdir,'/usr/local/etc/puppetlabs/puppet')
         $puppet_service_name = undef
       }
       default: {