Merge branch 'cwood-master'

Author: hunner

README.md

@@ -8,7 +8,7 @@ Table of Contents
 2. [Module Description - What does the module do?](#module-description)
 3. [Setup - The basics of getting started with PostgreSQL module](#setup)
     * [PE 3.2 supported module](#pe-32-supported-module)
-    * [Configuring the server](#configuring-the-server) 
+    * [Configuring the server](#configuring-the-server)
 4. [Usage - How to use the module for various tasks](#usage)
 5. [Reference - The classes, defines,functions and facts available in this module](#reference)
 6. [Limitations - OS compatibility, etc.](#limitations)
@@ -257,6 +257,9 @@ This setting can be used to override the default postgresql binaries directory f
 ####`xlogdir`
 This setting can be used to override the default postgresql xlog directory. If not specified the module will use initdb's default path.
 
+####`logdir`
+This setting can be used to override the default postgresql log directory. If not specified the module will use initdb's default path.
+
 ####`user`
 This setting can be used to override the default postgresql super user and owner of postgresql related files in the file system. If not specified, the module will use the user name 'postgres'.
 

manifests/globals.pp

@@ -29,6 +29,7 @@
   $confdir              = undef,
   $bindir               = undef,
   $xlogdir              = undef,
+  $logdir               = undef,
 
   $user                 = undef,
   $group                = undef,

manifests/server.pp

@@ -33,6 +33,7 @@
 
   $datadir                    = $postgresql::params::datadir,
   $xlogdir                    = $postgresql::params::xlogdir,
+  $logdir                     = $postgresql::params::logdir,
 
   $pg_hba_conf_defaults       = $postgresql::params::pg_hba_conf_defaults,
 

manifests/server/config.pp

@@ -16,6 +16,7 @@
   $manage_pg_hba_conf         = $postgresql::server::manage_pg_hba_conf
   $manage_pg_ident_conf       = $postgresql::server::manage_pg_ident_conf
   $datadir                    = $postgresql::server::datadir
+  $logdir                     = $postgresql::server::logdir
 
   if ($manage_pg_hba_conf == true) {
     # Prepare the main pg_hba file
@@ -104,6 +105,12 @@
   postgresql::server::config_entry { 'data_directory':
     value => $datadir,
   }
+  if $logdir {
+    postgresql::server::config_entry { 'log_directory':
+      value => $logdir,
+    }
+
+  }
 
   # RedHat-based systems hardcode some PG* variables in the init script, and need to be overriden
   # in /etc/sysconfig/pgsql/postgresql. Create a blank file so we can manage it with augeas later.

manifests/server/initdb.pp

@@ -4,6 +4,7 @@
   $initdb_path  = $postgresql::server::initdb_path
   $datadir      = $postgresql::server::datadir
   $xlogdir      = $postgresql::server::xlogdir
+  $logdir       = $postgresql::server::logdir
   $encoding     = $postgresql::server::encoding
   $locale       = $postgresql::server::locale
   $group        = $postgresql::server::group
@@ -27,6 +28,15 @@
     }
   }
 
+  if($logdir) {
+    # Make sure the log directory exists, and has the correct permissions.
+    file { $logdir:
+      ensure => directory,
+      owner  => $user,
+      group  => $group,
+    }
+  }
+
   if($needs_initdb) {
     # Build up the initdb command.
     #