fixup postgresql::db

Author: wfarr

manifests/db.pp

@@ -3,18 +3,19 @@
 # Usage:
 #
 #     postgresql::db { 'mydb': }
-define postgresql::db($ensure = present) {
+define postgresql::db(
+  $ensure = present
+) {
   require postgresql
 
   exec { "postgresql-db-${name}":
     command => join([
       'createdb',
-      "-p${postgresql::config::port}",
+      "-p${postgresql::port}",
       '-E UTF-8',
-      "-O ${::boxen_user}",
+      "-O ${postgresql::user}",
       $name
     ], ' '),
-    require => Exec['wait-for-postgresql'],
-    unless  => "psql -aA -p${postgresql::config::port} -t -l | cut -d \\| -f 1 | grep -w '${name}'"
+    unless  => "psql -aA -p${postgresql::port} -t -l | cut -d \\| -f 1 | grep -w '${name}'"
   }
 }

manifests/init.pp

@@ -18,6 +18,8 @@
 
   $service    = $postgresql::params::service,
   $enable     = $postgresql::params::enable,
+
+  $user       = $postgresql::params::user,
 ) inherits postgresql::params {
 
   class { 'postgresql::config':

manifests/params.pp

@@ -14,6 +14,8 @@
       $version    = '9.2.4-boxen2'
 
       $service    = 'dev.postgresql'
+
+      $user       = $::boxen_user
     }
 
     Ubuntu: {
@@ -26,6 +28,8 @@
       $version    = installed
 
       $service    = 'postgresql-9.1'
+
+      $user       = 'postgresql'
     }
 
     default: {