From ca80d708576245fa659ab6af9f2b41052307f846 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Thu, 30 Oct 2025 14:30:26 +0100 Subject: [PATCH 1/2] switched parameter - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/279 --- README.md | 11 +++++++---- manifests/params.pp | 8 +++----- manifests/server/databases/db_df.pp | 4 ++-- manifests/server/roles/role_df.pp | 4 ++-- 4 files changed, 14 insertions(+), 13 deletions(-) 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}": From df6c148f9c0b70bdb5d4960fe15e486c5a537a21 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Thu, 30 Oct 2025 14:37:11 +0100 Subject: [PATCH 2/2] Recommit for updates in build 35 --- doc/file.README.html | 13 ++++---- doc/index.html | 13 ++++---- .../postgresql_cd_3A_3Aparams.html | 32 ++++--------------- ...3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html | 4 +-- ...d_3A_3Aserver_3A_3Aroles_3A_3Arole_df.html | 4 +-- 5 files changed, 24 insertions(+), 42 deletions(-) diff --git a/doc/file.README.html b/doc/file.README.html index 0d1824e..aacc289 100644 --- a/doc/file.README.html +++ b/doc/file.README.html @@ -78,7 +78,7 @@

Installation

@@ -88,12 +88,13 @@

manage directory structure including file system permissions and selinux context

  • manage service status

    +
    • + +

    Optional:

    +

    Repo Documentation

    diff --git a/doc/index.html b/doc/index.html index 7b832e9..3ac12d3 100644 --- a/doc/index.html +++ b/doc/index.html @@ -78,7 +78,7 @@

    Installation

    @@ -88,12 +88,13 @@

    manage directory structure including file system permissions and selinux context

  • manage service status

    +
    • + +

    Optional:

    +

    Repo Documentation

    diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aparams.html b/doc/puppet_classes/postgresql_cd_3A_3Aparams.html index bf84673..88756e7 100644 --- a/doc/puppet_classes/postgresql_cd_3A_3Aparams.html +++ b/doc/puppet_classes/postgresql_cd_3A_3Aparams.html @@ -384,7 +384,7 @@
  • - pl_manage_roles + pl_manage_content (Boolean) @@ -395,25 +395,7 @@ —
    -

    Whether to manage roles

    -
    - -
    • - -
  • - - pl_manage_databases - - - (Boolean) - - - (defaults to: true) - - - — -
    -

    Whether to manage databases

    +

    whether to manage roles and databases

    • @@ -429,6 +411,7 @@ 
     
 
+24
 25
 26
 27
@@ -472,12 +455,10 @@
 65
 66
 67
-68
-69
-70
    +68 - 
    # File 'manifests/params.pp', line 25
+        
    # File 'manifests/params.pp', line 24
 
 class postgresql_cd::params (
 
@@ -502,8 +483,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/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html b/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html
index 47fc1b3..4520cb9 100644
--- a/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html
+++ b/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Adatabases_3A_3Adb_df.html
@@ -218,9 +218,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/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Aroles_3A_3Arole_df.html b/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Aroles_3A_3Arole_df.html
index 72cf6be..30c86c9 100644
--- a/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Aroles_3A_3Arole_df.html
+++ b/doc/puppet_defined_types/postgresql_cd_3A_3Aserver_3A_3Aroles_3A_3Arole_df.html
@@ -209,9 +209,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}":