mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 16:14:02 +00:00
puppet: Support setting an ssl_mode
verification level.
This commit is contained in:
committed by
Tim Abbott
parent
253bef27f5
commit
d17006da55
@@ -712,6 +712,15 @@ client connections.
|
|||||||
Set to the path to the PEM-encoded private key used to secure client
|
Set to the path to the PEM-encoded private key used to secure client
|
||||||
connections.
|
connections.
|
||||||
|
|
||||||
|
#### `ssl_mode`
|
||||||
|
|
||||||
|
The mode that should be used to verify the server certificate. The
|
||||||
|
PostgreSQL default is `prefer`, which provides no security benefit; we
|
||||||
|
strongly suggest setting this to `require` or better if you are using
|
||||||
|
certificate authentication. See the [PostgreSQL
|
||||||
|
documentation](https://www.postgresql.org/docs/current/libpq-ssl.html#LIBPQ-SSL-SSLMODE-STATEMENTS)
|
||||||
|
for potential values.
|
||||||
|
|
||||||
#### `version`
|
#### `version`
|
||||||
|
|
||||||
The version of PostgreSQL that is in use. Do not set by hand; use the
|
The version of PostgreSQL that is in use. Do not set by hand; use the
|
||||||
|
@@ -21,6 +21,7 @@ class zulip::profile::postgresql {
|
|||||||
$ssl_cert_file = zulipconf('postgresql', 'ssl_cert_file', undef)
|
$ssl_cert_file = zulipconf('postgresql', 'ssl_cert_file', undef)
|
||||||
$ssl_key_file = zulipconf('postgresql', 'ssl_key_file', undef)
|
$ssl_key_file = zulipconf('postgresql', 'ssl_key_file', undef)
|
||||||
$ssl_ca_file = zulipconf('postgresql', 'ssl_ca_file', undef)
|
$ssl_ca_file = zulipconf('postgresql', 'ssl_ca_file', undef)
|
||||||
|
$ssl_mode = zulipconf('postgresql', 'ssl_mode', undef)
|
||||||
|
|
||||||
file { $zulip::postgresql_base::postgresql_confdirs:
|
file { $zulip::postgresql_base::postgresql_confdirs:
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
|
@@ -796,6 +796,7 @@ restore_command = '/usr/local/bin/env-wal-g wal-fetch "%f" "%p"'
|
|||||||
<% if @replication_primary != '' && @replication_user != '' -%>
|
<% if @replication_primary != '' && @replication_user != '' -%>
|
||||||
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
||||||
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
||||||
|
<% if @ssl_mode != '' %> sslmode=<%= @ssl_mode %><% end -%>
|
||||||
'
|
'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
@@ -827,6 +827,7 @@ restore_command = '/usr/local/bin/env-wal-g wal-fetch "%f" "%p"'
|
|||||||
<% if @replication_primary != '' && @replication_user != '' -%>
|
<% if @replication_primary != '' && @replication_user != '' -%>
|
||||||
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
||||||
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
||||||
|
<% if @ssl_mode != '' %> sslmode=<%= @ssl_mode %><% end -%>
|
||||||
'
|
'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
@@ -848,6 +848,7 @@ restore_command = '/usr/local/bin/env-wal-g wal-fetch "%f" "%p"'
|
|||||||
<% if @replication_primary != '' && @replication_user != '' -%>
|
<% if @replication_primary != '' && @replication_user != '' -%>
|
||||||
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
||||||
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
||||||
|
<% if @ssl_mode != '' %> sslmode=<%= @ssl_mode %><% end -%>
|
||||||
'
|
'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
@@ -4,5 +4,6 @@ recovery_target_timeline = 'latest'
|
|||||||
<% if @replication_primary != '' && @replication_user != '' -%>
|
<% if @replication_primary != '' && @replication_user != '' -%>
|
||||||
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
primary_conninfo = 'host=<%= @replication_primary %> user=<%= @replication_user -%>
|
||||||
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
<% if @replication_password != '' %> password=<%= @replication_password %><% end -%>
|
||||||
|
<% if @ssl_mode != '' %> sslmode=<%= @ssl_mode %><% end -%>
|
||||||
'
|
'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
Reference in New Issue
Block a user