From 1c25a040f2ada2fa9a9c5e6148547ec27695ef8b Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 28 Sep 2025 14:12:41 +0200 Subject: [PATCH 1/2] fix ordering --- manifests/server/initdb.pp | 2 ++ manifests/server/service.pp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp index 9820605..135b1f2 100644 --- a/manifests/server/initdb.pp +++ b/manifests/server/initdb.pp @@ -7,6 +7,8 @@ class postgresql_cd::server::initdb ( ) inherits postgresql_cd::params { if $fqdn == $pl_server_fqdn { + require postgresql_cd::main::install + exec { 'init_pgsql_db': command => 'postgresql-setup --initdb', creates => "${pl_data_dir}/PG_VERSION", diff --git a/manifests/server/service.pp b/manifests/server/service.pp index 41e425a..ed6d74d 100644 --- a/manifests/server/service.pp +++ b/manifests/server/service.pp @@ -8,7 +8,7 @@ class postgresql_cd::server::service ( ) inherits postgresql_cd::params { if $fqdn == $pl_server_fqdn { require postgresql_cd::firewall::iptables - require postgresql_cd::server::initdb + include postgresql_cd::server::initdb service { $pl_service: ensure => running, From f89fc0988a6fe2643001f77c0bcab963316b46a9 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 28 Sep 2025 14:16:18 +0200 Subject: [PATCH 2/2] Recommit for updates in build 9 --- .../postgresql_cd_3A_3Aserver_3A_3Ainitdb.html | 6 +++++- .../postgresql_cd_3A_3Aserver_3A_3Aservice.html | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Ainitdb.html b/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Ainitdb.html index 5e7400a..f834f10 100644 --- a/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Ainitdb.html +++ b/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Ainitdb.html @@ -113,7 +113,9 @@ 15 16 17 -18 +18 +19 +20
# File 'manifests/server/initdb.pp', line 6
@@ -122,6 +124,8 @@ class postgresql_cd::server::initdb (
 
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
+    require postgresql_cd::main::install
+
     exec { 'init_pgsql_db':
       command => 'postgresql-setup --initdb',
       creates => "${pl_data_dir}/PG_VERSION",
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..f3045c2 100644
--- a/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html
@@ -125,7 +125,7 @@ class postgresql_cd::server::service (
 ) inherits postgresql_cd::params {
   if $fqdn == $pl_server_fqdn {
     require postgresql_cd::firewall::iptables
-    require postgresql_cd::server::initdb
+    include postgresql_cd::server::initdb
 
     service { $pl_service:
       ensure     => running,