6 files changed, 12 insertions, 18 deletions
diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 05153d87..1a8e6c5b 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -17,14 +17,13 @@ class bugzilla {
     $pgsql_password = extlookup("bugzilla_pgsql",'x')
     $ldap_password = extlookup("bugzilla_ldap",'x')
 
-    @@postgresql::user { 'bugs':
+    postgresql::remote_user { 'bugs':
         password => $pgsql_password,
     }
 
-    @@postgresql::database { 'bugs':
+    postgresql::remote_database { 'bugs':
         description => "Bugzilla database",
         user => "bugs",
-        require => Postgresql::User['bugs']
     }
 
     file { '/etc/bugzilla/localconfig':
diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index 89a2ce4c..7f84b0eb 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -16,7 +16,7 @@ class epoll {
      
     $pgsql_password = extlookup("epoll_pgsql",'x')
 
-    @@postgresql::user { 'epoll':
+    postgresql::remote_user { 'epoll':
         password => $pgsql_password,
     }
 
@@ -30,10 +30,9 @@ class epoll {
         content => template("epoll/epoll.yml")
     }
 
-    @@postgresql::database { 'epoll':
+    postgresql::remote_database { 'epoll':
         description => "Epoll database",
         user => "epoll",
-        require => Postgresql::User['epoll']
     }
 
 }
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 4b55904f..9fea4cad 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -13,14 +13,13 @@ class mga-mirrors {
 
     $pgsql_password = extlookup("mga_mirror_pgsql",'x')
 
-    @@postgresql::user { 'mirrors':
+    postgresql::remote_user { 'mirrors':
         password => $pgsql_password,
     }
 
-    @@postgresql::database { 'mirrors':
+    postgresql::remote_database { 'mirrors':
         description => "Mirrors database",
         user => "mirrors",
-        require => Postgresql::User['mirrors']
     }
  
     file { "mga-mirrors.ini": 
diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp
index 9ac8f562..a674baf7 100644
--- a/modules/phpbb/manifests/init.pp
+++ b/modules/phpbb/manifests/init.pp
@@ -29,7 +29,7 @@ class phpbb {
         }
 
         $pgsql_password = extlookup("phpbb_pgsql",'x')
-        @@postgresql::user { $user:
+        postgresql::remote_user { $user:
             password => $pgsql_password,
         }
 
@@ -120,10 +120,9 @@ class phpbb {
         }
 
 
-        @@postgresql::database { $database:
+        postgresql::remote_database { $database:
             description => "Phpbb database",
             user => $user,
-            require => Postgresql::User[$user]
         }
 
         phpbb_config { "ldap_user":
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 4ea4f37d..a0849f97 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -25,7 +25,7 @@ class sympa {
         $pgsql_password = extlookup("sympa_pgsql",'x')
         $ldap_password = extlookup("sympa_ldap",'x')
     
-        @@postgresql::user { 'sympa':
+        postgresql::remote_user { 'sympa':
             password => $pgsql_password,
         }
     
@@ -61,10 +61,9 @@ class sympa {
             content => template("sympa/vhost_ml.conf"),
         }
 
-        @@postgresql::database { 'sympa':
+        postgresql::remote_database { 'sympa':
             description => "Sympa database",
             user => "sympa",
-            require => Postgresql::User["sympa"]
         }
     
         subversion::snapshot { "/etc/sympa/web_tt2":
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index d6adf52b..564bfbe9 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -9,14 +9,13 @@ class transifex {
 
   $templates_dir = "/var/lib/transifex/templates"
 
-  @@postgresql::user { 'transifex':
+  postgresql::remote_user { 'transifex':
         password => $pgsql_password,
   }
 
-  @@postgresql::database { 'transifex':
+  postgresql::remote_database { 'transifex':
         description => "Transifex database",
         user => "transifex",
-        require => Postgresql::User['transifex']
   }
 
   file { "20-engines.conf":