diff options
author | Michael Scherer <misc@mageia.org> | 2011-06-17 16:48:56 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2011-06-17 16:48:56 +0000 |
commit | 11e769674b7afd61026e4e8cb2058f0520b10142 (patch) | |
tree | 8c3c301f1a85d5ab1a060c99b33c01607bae5af2 /modules | |
parent | b1678cee8b3f7ea3115faf0094b99237324afa74 (diff) | |
download | puppet-11e769674b7afd61026e4e8cb2058f0520b10142.tar puppet-11e769674b7afd61026e4e8cb2058f0520b10142.tar.gz puppet-11e769674b7afd61026e4e8cb2058f0520b10142.tar.bz2 puppet-11e769674b7afd61026e4e8cb2058f0520b10142.tar.xz puppet-11e769674b7afd61026e4e8cb2058f0520b10142.zip |
revert the change in rev1763, uneeded and broke some others manifests
Diffstat (limited to 'modules')
-rw-r--r-- | modules/postgresql/manifests/init.pp | 10 |
1 files changed, 5 insertions, 5 deletions
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\" ": |