From 80afa41f5506fd70f553b2e2b30d9d680afdeb47 Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 28 Sep 2025 15:55:34 +0200 Subject: [PATCH 1/2] ordering --- manifests/main/config.pp | 6 +++++- manifests/server/service.pp | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/main/config.pp b/manifests/main/config.pp index 9b193ff..5a8f2e2 100644 --- a/manifests/main/config.pp +++ b/manifests/main/config.pp @@ -6,5 +6,9 @@ class postgresql_cd::main::config ( ) inherits postgresql_cd::params { - include postgresql_cd::server::service + include postgresql_cd::main::install + + if $fqdn == $pl_server_fqdn { + include postgresql_cd::server::service + } } diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 41e425a..6de0ece 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -9,6 +9,7 @@ class postgresql_cd::server::service ( if $fqdn == $pl_server_fqdn { require postgresql_cd::firewall::iptables require postgresql_cd::server::initdb + require postgresql_cd::pghba::pg_hba service { $pl_service: ensure => running, From 87bb865b97731d4fc3ae95cbfe70fcd89d825f7a Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 28 Sep 2025 15:57:02 +0200 Subject: [PATCH 2/2] Recommit for updates in build 12 --- .../postgresql_cd_3A_3Amain_3A_3Aconfig.html | 12 ++++++++++-- .../postgresql_cd_3A_3Aserver_3A_3Aservice.html | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html index 1b60d92..7f0955f 100644 --- a/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html +++ b/doc/puppet_classes/postgresql_cd_3A_3Amain_3A_3Aconfig.html @@ -105,7 +105,11 @@ 7 8 9 -10 +10 +11 +12 +13 +14
# File 'manifests/main/config.pp', line 6
@@ -113,7 +117,11 @@
 class postgresql_cd::main::config (
 
 ) inherits postgresql_cd::params {
-  include postgresql_cd::server::service
+  include postgresql_cd::main::install
+
+  if $fqdn == $pl_server_fqdn {
+    include postgresql_cd::server::service
+  }
 }
diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html index 3904522..12b2a4e 100644 --- a/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html +++ b/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html @@ -115,7 +115,8 @@ 17 18 19 -20 +20 +21
# File 'manifests/server/service.pp', line 6
@@ -126,6 +127,7 @@ class postgresql_cd::server::service (
   if $fqdn == $pl_server_fqdn {
     require postgresql_cd::firewall::iptables
     require postgresql_cd::server::initdb
+    require postgresql_cd::pghba::pg_hba
 
     service { $pl_service:
       ensure     => running,