From bab092610cdf7af688374d8089a6557ee1c57492 Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Thu, 31 Mar 2022 19:37:49 +0300
Subject: [PATCH] debian: Update barbican packaging

This work is part of Debian integration effort.
This will fix a bootstrap issue.

Barbican will not start unless the log directory is created and has
correct permissions.

Tests:
PASS: build-pkgs
PASS: build-image
PASS: install iso
PASS: bootstrap

Story: 2009101
Task: 44903
Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Change-Id: I37e84dbc564632dba574a3ba3fa417a1e219bef2
---
 ...3-Create-barbican-user-group-log-dir.patch | 55 +++++++++++++++++++
 openstack/barbican/debian/deb_patches/series  |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 openstack/barbican/debian/deb_patches/0003-Create-barbican-user-group-log-dir.patch

diff --git a/openstack/barbican/debian/deb_patches/0003-Create-barbican-user-group-log-dir.patch b/openstack/barbican/debian/deb_patches/0003-Create-barbican-user-group-log-dir.patch
new file mode 100644
index 00000000..1cc87163
--- /dev/null
+++ b/openstack/barbican/debian/deb_patches/0003-Create-barbican-user-group-log-dir.patch
@@ -0,0 +1,55 @@
+From a729c3af80ec8b045ba8f04dfb7db4c90ab8b9c5 Mon Sep 17 00:00:00 2001
+From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
+Date: Thu, 31 Mar 2022 18:31:00 +0300
+Subject: [PATCH 3/3] Create barbican user, group, log dir
+
+Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
+---
+ debian/barbican-common.dirs                              | 1 +
+ ...{barbican-common.posinst => barbican-common.postinst} | 9 +--------
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+ create mode 100644 debian/barbican-common.dirs
+ rename debian/{barbican-common.posinst => barbican-common.postinst} (52%)
+
+diff --git a/debian/barbican-common.dirs b/debian/barbican-common.dirs
+new file mode 100644
+index 0000000..3a4ef46
+--- /dev/null
++++ b/debian/barbican-common.dirs
+@@ -0,0 +1 @@
++/var/log/barbican
+diff --git a/debian/barbican-common.posinst b/debian/barbican-common.postinst
+similarity index 52%
+rename from debian/barbican-common.posinst
+rename to debian/barbican-common.postinst
+index 9cf6a4c..bcf54d1 100644
+--- a/debian/barbican-common.posinst
++++ b/debian/barbican-common.postinst
+@@ -2,8 +2,6 @@
+ 
+ set -e
+ 
+-set -e
+-
+ if [ "$1" = "configure" ]; then
+     if ! getent group barbican > /dev/null 2>&1; then
+         addgroup --system barbican >/dev/null
+@@ -13,14 +11,9 @@ if [ "$1" = "configure" ]; then
+         adduser --system --home /var/lib/barbican --ingroup barbican --no-create-home --shell /bin/false barbican
+     fi
+ 
+-    chown barbican:adm /var/log/barbican
++    chown barbican:barbican /var/log/barbican
+     chmod 0750 /var/log/barbican
+ 
+-    find /etc/barbican -exec chown root:barbican "{}" +
+-    find /etc/barbican -type f -exec chmod 0640 "{}" + -o -type d -exec chmod 0750 "{}" +
+-
+-    find /var/lib/barbican -exec chown barbican:barbican "{}" +
+-    find /var/lib/barbican -type f -exec chmod 0640 "{}" + -o -type d -exec chmod 0750 "{}" +
+ fi
+ 
+ #DEBHELPER#
+-- 
+2.30.0
+
diff --git a/openstack/barbican/debian/deb_patches/series b/openstack/barbican/debian/deb_patches/series
index 272a6679..46890d6c 100644
--- a/openstack/barbican/debian/deb_patches/series
+++ b/openstack/barbican/debian/deb_patches/series
@@ -1,2 +1,3 @@
 0001-Remove-dbconfig-and-openstack-pkg-tools-config.patch
 0002-Start-barbican-api-with-gunicorn-during-bootstrap-fo.patch
+0003-Create-barbican-user-group-log-dir.patch