diff --git a/manifests/server/config.pp b/manifests/server/config.pp
index a2f2434485..24ba2efaf8 100644
--- a/manifests/server/config.pp
+++ b/manifests/server/config.pp
@@ -17,12 +17,22 @@
   $manage_pg_hba_conf         = $postgresql::server::manage_pg_hba_conf
   $manage_pg_ident_conf       = $postgresql::server::manage_pg_ident_conf
   $manage_recovery_conf       = $postgresql::server::manage_recovery_conf
+  $confdir                    = $postgresql::server::confdir
   $datadir                    = $postgresql::server::datadir
   $logdir                     = $postgresql::server::logdir
   $service_name               = $postgresql::server::service_name
   $log_line_prefix            = $postgresql::server::log_line_prefix
   $timezone                   = $postgresql::server::timezone
 
+  if ($confdir and $confdir != $datadir ) {
+    file { $confdir:
+      ensure => directory,
+      owner  => $user,
+      group  => $group,
+      mode   => '0750',
+    }
+  }
+
   if ($manage_pg_hba_conf == true) {
     # Prepare the main pg_hba file
     concat { $pg_hba_conf_path: