chore: Add remote secret store option to RHEL

nordic-institute · Feb 21, 2025 · 0415b28 · 0415b28
1 parent dd71c45
commit 0415b28
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/packages/src/xroad/redhat/SPECS/xroad-proxy.spec b/src/packages/src/xroad/redhat/SPECS/xroad-proxy.spec
@@ -17,7 +17,7 @@ Requires(post):     /usr/sbin/semanage, /usr/sbin/setsebool
 Requires(preun):    systemd
 Requires(postun):   systemd
 Requires:           net-tools, tar
-Requires:           xroad-base = %version-%release, xroad-confclient = %version-%release, xroad-signer = %version-%release, xroad-secret-store-local = %version-%release, rsyslog
+Requires:           xroad-base = %version-%release, xroad-confclient = %version-%release, xroad-signer = %version-%release, xroad-secret-store = %version-%release, rsyslog
 Requires:           xroad-database >= %version-%release, xroad-database <= %version-%{release}.1
 
 %define src %{_topdir}/..

diff --git a/src/packages/src/xroad/redhat/SPECS/xroad-secret-store-local.spec b/src/packages/src/xroad/redhat/SPECS/xroad-secret-store-local.spec
@@ -6,15 +6,16 @@ Name:               xroad-secret-store-local
 Version:            %{xroad_version}
 # release tag, e.g. 0.201508070816.el7 for snapshots and 1.el7 (for final releases)
 Release:            %{rel}%{?snapshot}%{?dist}
-Summary:            Meta-package for X-Road remote secret store dependencies
+Summary:            Meta-package for local secret store dependencies
 Group:              Applications/Internet
 License:            MIT
 Requires:           jq, bao >= 2.0.0
 Requires:           xroad-base = %version-%release
 Conflicts:          xroad-secret-store-local-remote
+Provides:           xroad-secret-store = %version-%{release}
 
 %description
-X-Road OpenBao Auto Init Service
+Installs OpenBao locally and automatically provisions it to align with X-Road.
 
 %clean
 rm -rf %{buildroot}

diff --git a/src/packages/src/xroad/redhat/SPECS/xroad-secret-store-remote.spec b/src/packages/src/xroad/redhat/SPECS/xroad-secret-store-remote.spec
@@ -0,0 +1,32 @@
+%include %{_specdir}/common.inc
+# produce .elX dist tag on both centos and redhat
+%define dist %(/usr/lib/rpm/redhat/dist.sh)
+
+Name:               xroad-secret-store-remote
+Version:            %{xroad_version}
+# release tag, e.g. 0.201508070816.el7 for snapshots and 1.el7 (for final releases)
+Release:            %{rel}%{?snapshot}%{?dist}
+Summary:            Meta-package for remote secret store dependencies
+Group:              Applications/Internet
+License:            MIT
+Requires:           xroad-base = %version-%release
+Conflicts:          xroad-secret-store-local-local
+Provides:           xroad-secret-store = %version-%{release}
+
+%description
+Prevents local installation of OpenBao when it is hosted remotely
+
+%clean
+
+%prep
+
+%build
+
+%install
+
+%files
+
+%pre -p /bin/bash
+%upgrade_check
+
+%post