From 491f81e3a43ec3429be5d6c79ceda98674dbe62d Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Tue, 22 Mar 2011 17:43:44 +0000
Subject: use the new type for user and database declaration ( will be used
 later for pg access list )

---
 modules/sympa/manifests/init.pp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'modules/sympa/manifests')

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"
         }
-- 
cgit v1.2.1