use the new type for user and database declaration ( will be used later for pg access list )

5 files changed, 11 insertions, 31 deletions

diff --git a/modules/bugzilla/manifests/init.pp b/modules/bugzilla/manifests/init.pp
index 1a8e6c5b..4707b60c 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -17,13 +17,9 @@ class bugzilla {
     $pgsql_password = extlookup("bugzilla_pgsql",'x')
     $ldap_password = extlookup("bugzilla_ldap",'x')
 
-    postgresql::remote_user { 'bugs':
-        password => $pgsql_password,
-    }
-
-    postgresql::remote_database { 'bugs':
+    postgresql::remote_db_and_user { 'bugs':
         description => "Bugzilla database",
-        user => "bugs",
+        password => $pgsql_password,
     }
 
     file { '/etc/bugzilla/localconfig':
diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index 7f84b0eb..147ad405 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -16,7 +16,8 @@ class epoll {
      
     $pgsql_password = extlookup("epoll_pgsql",'x')
 
-    postgresql::remote_user { 'epoll':
+    postgresql::remote_db_and_user { 'epoll':
+        description => "Epoll database",
         password => $pgsql_password,
     }
 
@@ -30,9 +31,4 @@ class epoll {
         content => template("epoll/epoll.yml")
     }
 
-    postgresql::remote_database { 'epoll':
-        description => "Epoll database",
-        user => "epoll",
-    }
-
 }
diff --git a/modules/mga-mirrors/manifests/init.pp b/modules/mga-mirrors/manifests/init.pp
index 9fea4cad..2532f56a 100644
--- a/modules/mga-mirrors/manifests/init.pp
+++ b/modules/mga-mirrors/manifests/init.pp
@@ -13,13 +13,9 @@ class mga-mirrors {
 
     $pgsql_password = extlookup("mga_mirror_pgsql",'x')
 
-    postgresql::remote_user { 'mirrors':
+    postgresql::remote_db_and_user { 'mirrors':
         password => $pgsql_password,
-    }
-
-    postgresql::remote_database { 'mirrors':
         description => "Mirrors database",
-        user => "mirrors",
     }
  
     file { "mga-mirrors.ini": 
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp
index 58d6baaf..4dd8ca15 100644
--- a/modules/sympa/manifests/init.pp
+++ b/modules/sympa/manifests/init.pp
@@ -25,10 +25,11 @@ class sympa {
         $pgsql_password = extlookup("sympa_pgsql",'x')
         $ldap_password = extlookup("sympa_ldap",'x')
     
-        postgresql::remote_user { 'sympa':
+        postgresql::remote_db_and_user { 'sympa':
             password => $pgsql_password,
+            description => "Sympa database",
         }
-    
+  
         file { '/etc/sympa/sympa.conf':
             ensure => present,
     	# should be cleaner to have it root owned, but puppet do not support acl
@@ -60,12 +61,7 @@ class sympa {
 	    use_ssl => true,
             content => template("sympa/vhost_ml.conf"),
         }
-
-        postgresql::remote_database { 'sympa':
-            description => "Sympa database",
-            user => "sympa",
-        }
-    
+   
         subversion::snapshot { "/etc/sympa/web_tt2":
             source => "svn://svn.mageia.org/svn/web/templates/sympa/trunk"
         }
diff --git a/modules/transifex/manifests/init.pp b/modules/transifex/manifests/init.pp
index 564bfbe9..86f4b9da 100644
--- a/modules/transifex/manifests/init.pp
+++ b/modules/transifex/manifests/init.pp
@@ -9,13 +9,9 @@ class transifex {
 
   $templates_dir = "/var/lib/transifex/templates"
 
-  postgresql::remote_user { 'transifex':
-        password => $pgsql_password,
-  }
-
-  postgresql::remote_database { 'transifex':
+  postgresql::remote_db_and_user { 'transifex':
         description => "Transifex database",
-        user => "transifex",
+        password => $pgsql_password,
   }
 
   file { "20-engines.conf":