Merge branch 'jenkins-build-8' into 'master'
Auto-merge for build 8 See merge request puppet/postgresql_cd!5
This commit is contained in:
@@ -97,9 +97,9 @@ max_connections = <%= @pl_max_conn %>
|
|||||||
|
|
||||||
<% if @pl_ssl_enabled == true -%>
|
<% if @pl_ssl_enabled == true -%>
|
||||||
ssl = on
|
ssl = on
|
||||||
ssl_ca_file = '<%= pl_data_dir %>/<%= @pl_ca_crt -%>'
|
ssl_ca_file = '<%= @pl_data_dir %>/<%= @pl_ca_crt -%>'
|
||||||
ssl_cert_file = '<%= pl_data_dir %>/<%= @pl_server_crt -%>'
|
ssl_cert_file = '<%= @pl_data_dir %>/<%= @pl_server_crt -%>'
|
||||||
ssl_key_file = '<%= pl_data_dir %>/<%= @pl_server_key -%>'
|
ssl_key_file = '<%= @pl_data_dir %>/<%= @pl_server_key -%>'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% if @pl_ssl_enabled != true -%>
|
<% if @pl_ssl_enabled != true -%>
|
||||||
ssl = off
|
ssl = off
|
||||||
|
|||||||
Reference in New Issue
Block a user