diff --git a/README.md b/README.md index 6c78dd5..4d4c288 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,19 @@ PostgreSQL is a powerful modern open source SQL database server. Installation -* install binaries as per given parameters for major and minor version +* install binaries * initialize the database cluster Configuration * manage directory structure including file system permissions and selinux context * manage service status -* manage single line entries in pg_hba via define (optional) -* manage roles via define (optional) -* manage databases via define (optional) + +Optional: + +* manage single line entries in pg_hba via define +* manage roles and databases via define (set `$pl_manage_content` to true) + ## Repo Documentation diff --git a/manifests/params.pp b/manifests/params.pp index a6c7645..e0de66d 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,6 +1,7 @@ ## postgresql_cd::params.pp # Module name: postgresql_cd # Author: Arne Teuke (arne_teuke@confdroid.com) +# @summary Class contains all parameters for the postgresql_cd module. # @param [String] pl_server_fqdn the fqdn of the postgresql server. Any other # system will be configured as client # @param [Array] reqpackages_server the packages for the server @@ -18,9 +19,7 @@ # @param [String] pl_server_crt the name of the server cert # @param [String] pl_server_key the name of the server key # @param [String] pl_ca_crt the name of the CA crt -# @param [Boolean] pl_manage_roles Whether to manage roles -# @param [Boolean] pl_manage_databases Whether to manage databases -# @summary Class contains all parameters for the postgresql_cd module. +# @param [Boolean] pl_manage_content whether to manage roles and databases ############################################################################## class postgresql_cd::params ( @@ -45,8 +44,7 @@ class postgresql_cd::params ( String $pl_server_crt = 'server.crt', String $pl_server_key = 'server.key', String $pl_ca_crt = 'root.crt', - Boolean $pl_manage_roles = true, - Boolean $pl_manage_databases = true, + Boolean $pl_manage_content = true, ) { $fqdn = $facts['networking']['fqdn'] diff --git a/manifests/server/databases/db_df.pp b/manifests/server/databases/db_df.pp index bf8fda0..549a807 100644 --- a/manifests/server/databases/db_df.pp +++ b/manifests/server/databases/db_df.pp @@ -17,9 +17,9 @@ define postgresql_cd::server::databases::db_df ( Optional[String] $pl_db_action = undef, String $pl_db_extension = 'pg_trgm', ) { - $pl_manage_databases = $postgresql_cd::params::pl_manage_databases + $pl_manage_content = $postgresql_cd::params::pl_manage_content - if $pl_manage_databases == true { + if $pl_manage_content == true { # create databases if $pl_db_action == 'CREATE DATABASE' { diff --git a/manifests/server/roles/role_df.pp b/manifests/server/roles/role_df.pp index 9bca733..a274872 100644 --- a/manifests/server/roles/role_df.pp +++ b/manifests/server/roles/role_df.pp @@ -17,9 +17,9 @@ define postgresql_cd::server::roles::role_df ( String $pl_role_status = 'CREATE ROLE', ) { - $pl_manage_roles = $postgresql_cd::params::pl_manage_roles + $pl_manage_content = $postgresql_cd::params::pl_manage_content - if $pl_manage_roles == true { + if $pl_manage_content == true { # create the role exec { "role_${name}":