Added puppetlabs-firewall (required by puppetlabs-postgresql), updated the other modules.

modules/postgresql/manifests/server/database.pp

@@ -12,13 +12,16 @@ define postgresql::server::database(
   $user          = $postgresql::server::user
   $group         = $postgresql::server::group
   $psql_path     = $postgresql::server::psql_path
+  $port          = $postgresql::server::port
   $version       = $postgresql::server::version
+  $default_db    = $postgresql::server::default_database
 
   # Set the defaults for the postgresql_psql resource
   Postgresql_psql {
     psql_user  => $user,
     psql_group => $group,
     psql_path  => $psql_path,
+    port       => $port,
   }
 
   # Optionally set the locale switch. Older versions of createdb may not accept
@@ -44,11 +47,13 @@ define postgresql::server::database(
     default => "--tablespace='${tablespace}' ",
   }
 
-  $createdb_command = "${createdb_path} --owner='${owner}' --template=${template} ${encoding_option}${locale_option}${tablespace_option} '${dbname}'"
+  $createdb_command = "${createdb_path} --port='${port}' --owner='${owner}' --template=${template} ${encoding_option}${locale_option}${tablespace_option} '${dbname}'"
 
   postgresql_psql { "Check for existence of db '${dbname}'":
     command => 'SELECT 1',
     unless  => "SELECT datname FROM pg_database WHERE datname='${dbname}'",
+    db      => $default_db,
+    port    => $port,
     require => Class['postgresql::server::service']
   }~>
   exec { $createdb_command :
@@ -60,13 +65,15 @@ define postgresql::server::database(
   # This will prevent users from connecting to the database unless they've been
   #  granted privileges.
   postgresql_psql {"REVOKE ${public_revoke_privilege} ON DATABASE \"${dbname}\" FROM public":
-    db          => $user,
+    db          => $default_db,
+    port        => $port,
     refreshonly => true,
   }
 
   Exec [ $createdb_command ]->
   postgresql_psql {"UPDATE pg_database SET datistemplate = ${istemplate} WHERE datname = '${dbname}'":
     unless => "SELECT datname FROM pg_database WHERE datname = '${dbname}' AND datistemplate = ${istemplate}",
+    db     => $default_db,
   }
 
   # Build up dependencies on tablespace