Recommit for updates in build 24
This commit is contained in:
@@ -97,6 +97,8 @@
|
||||
<p>manage extensions (set <code>pl_manage_extensions</code>to <code>true</code>)</p>
|
||||
</li><li>
|
||||
<p>install and manage pg_bouncer (set <code>pl_use_pg_bouncer</code>to <code>true</code>)</p>
|
||||
</li><li>
|
||||
<p>enable SL / TLS manage TLS certificates (set <code>pl_ssl_enabled</code>to <code>true</code> and populate content externally through variables)</p>
|
||||
</li></ul>
|
||||
|
||||
<h2 id="label-Repo+Documentation">Repo Documentation</h2>
|
||||
|
||||
@@ -97,6 +97,8 @@
|
||||
<p>manage extensions (set <code>pl_manage_extensions</code>to <code>true</code>)</p>
|
||||
</li><li>
|
||||
<p>install and manage pg_bouncer (set <code>pl_use_pg_bouncer</code>to <code>true</code>)</p>
|
||||
</li><li>
|
||||
<p>enable SL / TLS manage TLS certificates (set <code>pl_ssl_enabled</code>to <code>true</code> and populate content externally through variables)</p>
|
||||
</li></ul>
|
||||
|
||||
<h2 id="label-Repo+Documentation">Repo Documentation</h2>
|
||||
|
||||
@@ -121,7 +121,49 @@
|
||||
23
|
||||
24
|
||||
25
|
||||
26</pre>
|
||||
26
|
||||
27
|
||||
28
|
||||
29
|
||||
30
|
||||
31
|
||||
32
|
||||
33
|
||||
34
|
||||
35
|
||||
36
|
||||
37
|
||||
38
|
||||
39
|
||||
40
|
||||
41
|
||||
42
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
47
|
||||
48
|
||||
49
|
||||
50
|
||||
51
|
||||
52
|
||||
53
|
||||
54
|
||||
55
|
||||
56
|
||||
57
|
||||
58
|
||||
59
|
||||
60
|
||||
61
|
||||
62
|
||||
63
|
||||
64
|
||||
65
|
||||
66
|
||||
67
|
||||
68</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -145,6 +187,48 @@ class confdroid_postgresql::main::files (
|
||||
content => template('confdroid_postgresql/postgresql.conf.erb'),
|
||||
notify => Service[$pl_service],
|
||||
}
|
||||
if $pl_ssl_enabled == true {
|
||||
# manage tls certs
|
||||
## ca.crt
|
||||
file { $pl_ca_crt_file:
|
||||
ensure => file,
|
||||
owner => 'postgres',
|
||||
group => 'postgres',
|
||||
mode => '0400',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => postgresql_db_t,
|
||||
seluser => unconfined_u,
|
||||
content => template($pl_ca_crt_erb),
|
||||
notify => Service[$pl_service],
|
||||
}
|
||||
## server.crt
|
||||
file { $pl_server_crt_file:
|
||||
ensure => file,
|
||||
owner => 'postgres',
|
||||
group => 'postgres',
|
||||
mode => '0400',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => postgresql_db_t,
|
||||
seluser => unconfined_u,
|
||||
content => template($pl_server_crt_erb),
|
||||
notify => Service[$pl_service],
|
||||
}
|
||||
## server.key
|
||||
file { $pl_server_key_file:
|
||||
ensure => file,
|
||||
owner => 'postgres',
|
||||
group => 'postgres',
|
||||
mode => '0400',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => postgresql_db_t,
|
||||
seluser => unconfined_u,
|
||||
content => template($pl_server_key_erb),
|
||||
notify => Service[$pl_service],
|
||||
}
|
||||
}
|
||||
}
|
||||
}</pre>
|
||||
</td>
|
||||
|
||||
@@ -743,7 +743,13 @@
|
||||
105
|
||||
106
|
||||
107
|
||||
108</pre>
|
||||
108
|
||||
109
|
||||
110
|
||||
111
|
||||
112
|
||||
113
|
||||
114</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 38</span>
|
||||
@@ -810,6 +816,12 @@ class confdroid_postgresql::params (
|
||||
$pl_bouncer_auth_file = "${pl_bouncer_dir}/userlist.txt"
|
||||
$pl_bouncer_auth_erb = 'confdroid_postgresql/server/bouncer/bouncer_users.erb'
|
||||
$pl_bouncer_rule_erb = 'confdroid_postgresql/server/bouncer/bouncer_rule.erb'
|
||||
$pl_ca_crt_file = "${pl_data_dir}/ca.crt"
|
||||
$pl_ca_crt_erb = 'confdroid_postgresql/server/ca.crt.erb'
|
||||
$pl_server_crt_file = "${pl_data_dir}/server.crt"
|
||||
$pl_server_crt_erb = 'confdroid_postgresql/server/server.crt.erb'
|
||||
$pl_server_key_file = "${pl_data_dir}/server.key"
|
||||
$pl_server_key_erb = 'confdroid_postgresql/server/server.key.erb'
|
||||
|
||||
# Service
|
||||
$pl_service = 'postgresql'
|
||||
|
||||
Reference in New Issue
Block a user