From 3fb019e059d6f079920c28ca0b3ecb717155ebea Mon Sep 17 00:00:00 2001 From: Arne Teuke Date: Sun, 28 Sep 2025 14:28:49 +0200 Subject: [PATCH 1/2] fix path --- manifests/server/service.pp | 2 +- templates/postgresql.conf.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/server/service.pp b/manifests/server/service.pp index ed6d74d..41e425a 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 - include postgresql_cd::server::initdb + require postgresql_cd::server::initdb service { $pl_service: ensure => running, diff --git a/templates/postgresql.conf.erb b/templates/postgresql.conf.erb index 9b52e42..41f1078 100644 --- a/templates/postgresql.conf.erb +++ b/templates/postgresql.conf.erb @@ -97,9 +97,9 @@ max_connections = <%= @pl_max_conn %> <% if @pl_ssl_enabled == true -%> ssl = on -ssl_ca_file = '<%= @pl_data_dir %>/<%= @pl_ca_crt -%>' -ssl_cert_file = '<%= @pl_data_dir %>/<%= @pl_server_crt -%>' -ssl_key_file = '<%= @pl_data_dir %>/<%= @pl_server_key -%>' +ssl_ca_file = '<%= @pl_data_dir %><%= @pl_ca_crt -%>' +ssl_cert_file = '<%= @pl_data_dir %><%= @pl_server_crt -%>' +ssl_key_file = '<%= @pl_data_dir %><%= @pl_server_key -%>' <% end -%> <% if @pl_ssl_enabled != true -%> ssl = off From b3c920301034f55c27f9c236fa9859e96ca15446 Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Sun, 28 Sep 2025 14:30:09 +0200 Subject: [PATCH 2/2] Recommit for updates in build 10 --- doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f3045c2..3904522 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 - include postgresql_cd::server::initdb + require postgresql_cd::server::initdb service { $pl_service: ensure => running,