Merge pull request #29 from etiennep/master

Issue #28

Modulefile

@@ -7,5 +7,5 @@ summary 'PostgreSQL defined resource types'
 license 'Apache'
 project_page 'https://github.com/puppetlabs/puppet-postgresql/issues'
 
-dependency 'puppetlabs/stdlib', '2.x'
+dependency 'puppetlabs/stdlib', '3.x'
 dependency 'puppetlabs/firewall', '>= 0.0.4'

manifests/db.pp

@@ -46,12 +46,14 @@ define postgresql::db (
     require     => Class['postgresql::server'],
   }
 
-  postgresql::database_user { $user:
-    # TODO: ensure is not yet supported
-    #ensure         => present,
-    password_hash   => $password,
-    #provider       => 'postgresql',
-    require         => Postgresql::Database[$name],
+  if ! defined(Postgresql::Database_user[$user]) {
+    postgresql::database_user { $user:
+      # TODO: ensure is not yet supported
+      #ensure         => present,
+      password_hash   => $password,
+      #provider       => 'postgresql',
+      require         => Postgresql::Database[$name],
+    }
   }
 
   postgresql::database_grant { "GRANT ${user} - ${grant} - ${name}":