confdroid/confdroid_postgresql
3
0
Fork 0
Code Wiki Activity

Merge branch 'jenkins-build-10' into 'master'

Browse Source 
Auto-merge for build 10

See merge request puppet/postgresql_cd!7
This commit is contained in:
Jenkins
2025-09-28 12:30:49 +00:00
parent 4d109d9f63 b3c9203010
commit a04d459bd8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/puppet_classes/postgresql_cd_3A_3Aserver_3A_3Aservice.html
View File

@@ -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,

2
manifests/server/service.pp
View File

@@ -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,

6
templates/postgresql.conf.erb
View File

@@ -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