1 From 94cc61ad7f76d94791fee4f596d3c8c3124c0526 Mon Sep 17 00:00:00 2001
2 From: Don Penney <don.penney@windriver.com>
3 Date: Wed, 11 Jan 2017 14:25:20 -0500
4 Subject: [PATCH] Roll up TIS patches
7 manifests/params.pp | 2 +-
8 manifests/server/config.pp | 8 ++++++--
9 manifests/server/initdb.pp | 9 +++++++++
10 3 files changed, 16 insertions(+), 3 deletions(-)
12 diff --git a/manifests/params.pp b/manifests/params.pp
13 index d40a1eb..45be360 100644
14 --- a/manifests/params.pp
15 +++ b/manifests/params.pp
16 @@ -74,7 +74,7 @@ class postgresql::params inherits postgresql::globals {
18 $psql_path = pick($psql_path, "${bindir}/psql")
20 - $service_status = $service_status
21 + $service_status = "systemctl is-active postgresql"
22 $service_reload = "service ${service_name} reload"
23 $perl_package_name = pick($perl_package_name, 'perl-DBD-Pg')
24 $python_package_name = pick($python_package_name, 'python-psycopg2')
25 diff --git a/manifests/server/config.pp b/manifests/server/config.pp
26 index 205dd22..2ecad4b 100644
27 --- a/manifests/server/config.pp
28 +++ b/manifests/server/config.pp
29 @@ -111,6 +111,12 @@ class postgresql::server::config {
30 postgresql::server::config_entry { 'data_directory':
33 + postgresql::server::config_entry { 'hba_file':
34 + value => $pg_hba_conf_path,
36 + postgresql::server::config_entry { 'ident_file':
37 + value => $pg_ident_conf_path,
40 postgresql::server::config_entry { 'timezone':
42 @@ -154,7 +160,6 @@ class postgresql::server::config {
43 concat { $pg_ident_conf_path:
46 - force => true, # do not crash if there is no pg_ident_rules
49 notify => Class['postgresql::server::reload'],
50 @@ -165,7 +170,6 @@ class postgresql::server::config {
51 concat { $recovery_conf_path:
54 - force => true, # do not crash if there is no recovery conf file
57 notify => Class['postgresql::server::reload'],
58 diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp
59 index 2252a19..5e263e3 100644
60 --- a/manifests/server/initdb.pp
61 +++ b/manifests/server/initdb.pp
62 @@ -3,6 +3,7 @@ class postgresql::server::initdb {
63 $needs_initdb = $postgresql::server::needs_initdb
64 $initdb_path = $postgresql::server::initdb_path
65 $datadir = $postgresql::server::datadir
66 + $confdir = $postgresql::server::confdir
67 $xlogdir = $postgresql::server::xlogdir
68 $logdir = $postgresql::server::logdir
69 $encoding = $postgresql::server::encoding
70 @@ -41,6 +42,14 @@ class postgresql::server::initdb {
74 + # Make sure the conf directory exists, and has the correct permissions.
76 + ensure => directory,
83 # Make sure the xlog directory exists, and has the correct permissions.