meta-stx/recipes-support/puppet/files/puppetlabs-postgresql/0001-Roll-up-TIS-patches.patch

   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
   5
   6 ---
   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(-)
  11
  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 {
  17        }
  18        $psql_path           = pick($psql_path, "${bindir}/psql")
  19
  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':
  31      value => $datadir,
  32    }
  33 +  postgresql::server::config_entry { 'hba_file':
  34 +    value => $pg_hba_conf_path,
  35 +  }
  36 +  postgresql::server::config_entry { 'ident_file':
  37 +    value => $pg_ident_conf_path,
  38 +  }
  39    if $timezone {
  40      postgresql::server::config_entry { 'timezone':
  41        value => $timezone,
  42 @@ -154,7 +160,6 @@ class postgresql::server::config {
  43      concat { $pg_ident_conf_path:
  44        owner  => $user,
  45        group  => $group,
  46 -      force  => true, # do not crash if there is no pg_ident_rules
  47        mode   => '0640',
  48        warn   => true,
  49        notify => Class['postgresql::server::reload'],
  50 @@ -165,7 +170,6 @@ class postgresql::server::config {
  51      concat { $recovery_conf_path:
  52        owner  => $user,
  53        group  => $group,
  54 -      force  => true, # do not crash if there is no recovery conf file
  55        mode   => '0640',
  56        warn   => true,
  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 {
  71      seltype => $seltype,
  72    }
  73
  74 +  # Make sure the conf directory exists, and has the correct permissions.
  75 +  file { $confdir:
  76 +    ensure => directory,
  77 +    owner  => $user,
  78 +    group  => $group,
  79 +    mode   => '0700',
  80 +  }
  81 +
  82    if($xlogdir) {
  83      # Make sure the xlog directory exists, and has the correct permissions.
  84      file { $xlogdir:
  85 --
  86 1.8.3.1
  87