From d984a48580308350631d4a712acbc1e1d56b08ba Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 26 Oct 2025 17:53:50 +0100 Subject: [PATCH 1/2] fix variable - https://gitlab.confdroid.com/internal/confdroid_management/-/issues/284 --- manifests/params.pp | 4 ++-- manifests/puppetdb/dirs.pp | 2 +- manifests/puppetdb/files.pp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index e50e3d5..1a704e4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -102,13 +102,13 @@ class puppet_cd::params ( # user settings ## puppet user - Boolean $pt_manage_user = true, + Boolean $pt_manage_user = false, String $pt_user = 'puppet', String $pt_user_comment = 'puppetserver daemon', String $pt_user_home = '/opt/puppetlabs/server/data/puppetserver', String $pt_user_shell = '/sbin/nologin', ## puppetdb user - Boolean $pt_manage_db_user = true, + Boolean $pt_manage_db_user = false, String $pt_db_user = 'puppetdb', String $pt_db_user_comment = 'PuppetDB daemon', String $pt_db_user_home = '/opt/puppetlabs/server/data/puppetdb', diff --git a/manifests/puppetdb/dirs.pp b/manifests/puppetdb/dirs.pp index a023923..8a0298e 100644 --- a/manifests/puppetdb/dirs.pp +++ b/manifests/puppetdb/dirs.pp @@ -6,7 +6,7 @@ class puppet_cd::puppetdb::dirs ( ) inherits puppet_cd::params { - if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) { + if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) { require puppet_cd::main::install # main directory diff --git a/manifests/puppetdb/files.pp b/manifests/puppetdb/files.pp index a0ae43d..1e7b240 100644 --- a/manifests/puppetdb/files.pp +++ b/manifests/puppetdb/files.pp @@ -6,7 +6,7 @@ class puppet_cd::puppetdb::files ( ) inherits puppet_cd::params { - if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) { + if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) { require puppet_cd::puppetdb::dirs # bootstrap.cfg From 1a96519f074c57280e26165bea826f3149968829 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 26 Oct 2025 17:55:20 +0100 Subject: [PATCH 2/2] Recommit for updates in build 65 --- doc/puppet_classes/puppet_cd_3A_3Aparams.html | 8 ++++---- doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html | 2 +- .../puppet_cd_3A_3Apuppetdb_3A_3Afiles.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index eecc585..2acb544 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -396,7 +396,7 @@ (Boolean) - (defaults to: true) + (defaults to: false) — @@ -1494,7 +1494,7 @@ (Boolean) - (defaults to: true) + (defaults to: false) — @@ -1715,13 +1715,13 @@ class puppet_cd::params ( # user settings ## puppet user - Boolean $pt_manage_user = true, + Boolean $pt_manage_user = false, String $pt_user = 'puppet', String $pt_user_comment = 'puppetserver daemon', String $pt_user_home = '/opt/puppetlabs/server/data/puppetserver', String $pt_user_shell = '/sbin/nologin', ## puppetdb user - Boolean $pt_manage_db_user = true, + Boolean $pt_manage_db_user = false, String $pt_db_user = 'puppetdb', String $pt_db_user_comment = 'PuppetDB daemon', String $pt_db_user_home = '/opt/puppetlabs/server/data/puppetdb', diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html index b0c25f1..02b9fe6 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html @@ -167,7 +167,7 @@ class puppet_cd::puppetdb::dirs ( ) inherits puppet_cd::params { - if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) { + if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) { require puppet_cd::main::install # main directory diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html index 5f82142..39822df 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html +++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html @@ -220,7 +220,7 @@ class puppet_cd::puppetdb::files ( ) inherits puppet_cd::params { - if ($fqdn == $pt_puppetdb_server) and ($pt_use_puppetdb == true) { + if ($fqdn == $pt_db_fqdn) and ($pt_use_puppetdb == true) { require puppet_cd::puppetdb::dirs # bootstrap.cfg