From cdd8759b506ffe8ea0dbfeb716651759691b1668 Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Wed, 15 Sep 2021 16:25:01 +0300
Subject: [PATCH] Add debian package for puppetlabs-postgresql-6.7.0

Aligned with Debian Bullseye version puppetlabs-postgresql-6.7.0-2.

Did build puppetlabs-postgresql-6.7.0 + starlingx patches(adapted from
CentOS7). Adapted all patches. Dropped 1 patch.
Did build an iso.

Story: 2009101
Task: 43326
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Change-Id: Ie5a509cacf14a1e572681f9001804155deff51f3
---
 .../debian/meta_data.yaml                     | 10 +++
 ...01-Adapt-first-set-of-legacy-patches.patch | 63 +++++++++++++++++++
 .../debian/patches/series                     |  1 +
 3 files changed, 74 insertions(+)
 create mode 100644 config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/meta_data.yaml
 create mode 100644 config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/0001-Adapt-first-set-of-legacy-patches.patch
 create mode 100644 config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/series

diff --git a/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/meta_data.yaml b/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/meta_data.yaml
new file mode 100644
index 000000000..20633ba30
--- /dev/null
+++ b/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/meta_data.yaml
@@ -0,0 +1,10 @@
+---
+debname: puppet-module-puppetlabs-postgresql
+debver: 6.7.0-2
+dl_path:
+  name: puppet-module-puppetlabs-postgresql-6.7.0-2.tar.gz
+  url: https://salsa.debian.org/puppet-team/puppet-module-puppetlabs-postgresql/-/archive/debian/6.7.0-2/puppet-module-puppetlabs-postgresql-debian-6.7.0-2.tar.gz
+  md5sum: 4ea08eb9aeb3d80b4ef0d41f4219557e
+revision:
+  dist: $STX_DIST
+  PKG_GITREVCOUNT: true
diff --git a/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/0001-Adapt-first-set-of-legacy-patches.patch b/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/0001-Adapt-first-set-of-legacy-patches.patch
new file mode 100644
index 000000000..a980b9839
--- /dev/null
+++ b/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/0001-Adapt-first-set-of-legacy-patches.patch
@@ -0,0 +1,63 @@
+From f4baa299dbd842494e40f46ce7b29d20aaf6acab Mon Sep 17 00:00:00 2001
+From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
+Date: Wed, 15 Sep 2021 16:27:35 +0300
+Subject: [PATCH] Adapt first set of legacy patches
+
+Adapt 0001-Roll-up-TIS-patches.patch from CentOS.
+
+Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
+---
+ manifests/server/config.pp | 9 +++++++++
+ manifests/server/initdb.pp | 9 +++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/manifests/server/config.pp b/manifests/server/config.pp
+index 93bc9b9..cc4bffd 100644
+--- a/manifests/server/config.pp
++++ b/manifests/server/config.pp
+@@ -149,6 +149,15 @@ class postgresql::server::config {
+   postgresql::server::config_entry { 'data_directory':
+     value => $datadir,
+   }
++
++  postgresql::server::config_entry { 'hba_file':
++    value => $pg_hba_conf_path,
++  }
++
++  postgresql::server::config_entry { 'ident_file':
++    value => $pg_ident_conf_path,
++  }
++
+   if $timezone {
+     postgresql::server::config_entry { 'timezone':
+       value => $timezone,
+diff --git a/manifests/server/initdb.pp b/manifests/server/initdb.pp
+index a73186d..8f90f6f 100644
+--- a/manifests/server/initdb.pp
++++ b/manifests/server/initdb.pp
+@@ -5,6 +5,7 @@ class postgresql::server::initdb {
+   $datadir        = $postgresql::server::datadir
+   $xlogdir        = $postgresql::server::xlogdir
+   $logdir         = $postgresql::server::logdir
++  $confdir        = $postgresql::server::confdir
+   $manage_datadir = $postgresql::server::manage_datadir
+   $manage_logdir  = $postgresql::server::manage_logdir
+   $manage_xlogdir = $postgresql::server::manage_xlogdir
+@@ -56,6 +57,14 @@ class postgresql::server::initdb {
+     }
+   }
+ 
++  # Make sure the conf directory exists, and has the correct permissions.
++  file { $confdir:
++    ensure => directory,
++    owner  => $user,
++    group  => $group,
++    mode   => '0700',
++  }
++
+   if($xlogdir) {
+     if($manage_xlogdir) {
+       # Make sure the xlog directory exists, and has the correct permissions.
+-- 
+2.30.0
+
diff --git a/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/series b/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/series
new file mode 100644
index 000000000..563d1ae6a
--- /dev/null
+++ b/config/puppet-modules/puppetlabs-postgresql-6.7.0/debian/patches/series
@@ -0,0 +1 @@
+0001-Adapt-first-set-of-legacy-patches.patch