From 11e769674b7afd61026e4e8cb2058f0520b10142 Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Fri, 17 Jun 2011 16:48:56 +0000
Subject: revert the change in rev1763, uneeded and broke some others manifests

---
 modules/postgresql/manifests/init.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/postgresql/manifests/init.pp')

diff --git a/modules/postgresql/manifests/init.pp b/modules/postgresql/manifests/init.pp
index 0412f6e0..11f4294d 100644
--- a/modules/postgresql/manifests/init.pp
+++ b/modules/postgresql/manifests/init.pp
@@ -84,7 +84,7 @@ class postgresql {
     define tagged() {
         # TODO add a system of tag so we can declare database on more than one
         # server 
-        Postgresql::Db_user <<| tag == $name |>>
+        Postgresql::User <<| tag == $name |>>
         Postgresql::Database <<| tag == $name |>>
         Postgresql::Db_and_user <<| tag == $name |>>
     }
@@ -127,7 +127,7 @@ class postgresql {
     define remote_user($password, 
                        $tag = "default")
     {
-        @@postgresql::db_user { $name:
+        @@postgresql::user { $name:
             tag => $tag,
             password => $password,
         }
@@ -137,13 +137,13 @@ class postgresql {
                        $callback_notify = "",
                        $password ) {
 
-        postgresql::database { $name:
+        database { $name:
                    callback_notify => $callback_notify, 
                    description => $description,
                    user => $name,
         }
 
-        postgresql::db_user { $name:
+        user { $name:
                password => $password
         }
         
@@ -179,7 +179,7 @@ class postgresql {
     
     # TODO convert to a regular type, so we can later change password without erasing the 
     # current user
-    define db_user($password) {
+    define user($password) {
         $sql = "CREATE ROLE $name ENCRYPTED PASSWORD '\$pass' NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;"
 
         exec { "psql -U postgres -c \"$sql\" ":
-- 
cgit v1.2.1