diff options
| -rw-r--r-- | modules/postgresql/manifests/database.pp | 19 | ||||
| -rw-r--r-- | modules/postgresql/manifests/init.pp | 19 |
2 files changed, 20 insertions, 18 deletions
diff --git a/modules/postgresql/manifests/database.pp b/modules/postgresql/manifests/database.pp new file mode 100644 index 00000000..82670b5e --- /dev/null +++ b/modules/postgresql/manifests/database.pp @@ -0,0 +1,19 @@ +# TODO convert it to a regular type ( so we can later change user and so on ) +define postgresql::database($description = '', + $user = 'postgres', + $callback_notify = '') { + + exec { "createdb -O $user -U postgres $name '$description'": + user => 'root', + unless => "psql -A -t -U postgres -l | grep '^$name|'", + require => Service['postgresql'], + } + + # this is fetched by the manifest asking the database creation, + # once the db have been created + # FIXME proper ordering ? + @@postgresql::database_callback { $name: + tag => $name, + callback_notify => $callback_notify, + } +} diff --git a/modules/postgresql/manifests/init.pp b/modules/postgresql/manifests/init.pp index e943052d..dcce8946 100644 --- a/modules/postgresql/manifests/init.pp +++ b/modules/postgresql/manifests/init.pp @@ -139,22 +139,5 @@ class postgresql { } } - # TODO convert it to a regular type ( so we can later change user and so on ) - define database($description = "", - $user = "postgres", - $callback_notify = "") { - exec { "createdb -O $user -U postgres $name '$description'": - user => root, - unless => "psql -A -t -U postgres -l | grep '^$name|'", - require => Service['postgresql'], - } - - # this is fetched by the manifest asking the database creation, once the db have been created - # FIXME proper ordering ? - @@postgresql::database_callback { $name: - tag => $name, - callback_notify => $callback_notify, - } - } - + } |