|
 |
8394b4 |
From f570348659620a59b681e7bf315bd979cd7de497 Mon Sep 17 00:00:00 2001
|
|
|
8394b4 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
8394b4 |
Date: Mon, 13 Jan 2020 14:40:49 -0500
|
|
|
8394b4 |
Subject: [PATCH] Issue 50812 - dscontainer executable should be placed under
|
|
|
8394b4 |
/usr/libexec/dirsrv/
|
|
|
8394b4 |
|
|
|
8394b4 |
Description: dscontainer is not a user-runnable executable. Per packaging
|
|
|
8394b4 |
guidelines it should be placed under /usr/libexec/dirsrv/
|
|
|
8394b4 |
|
|
|
8394b4 |
relates: https://pagure.io/389-ds-base/issue/50812
|
|
|
8394b4 |
|
|
|
8394b4 |
Reviewed by: firstyear & mhonek (Thanks!!)
|
|
|
8394b4 |
---
|
|
|
8394b4 |
docker/389-ds-fedora/Dockerfile | 6 +++---
|
|
|
8394b4 |
docker/389-ds-suse/Dockerfile | 4 ++--
|
|
|
8394b4 |
docker/389-ds-suse/Dockerfile.release | 2 +-
|
|
|
8394b4 |
rpm/389-ds-base.spec.in | 2 +-
|
|
|
8394b4 |
src/lib389/setup.py | 4 +++-
|
|
|
8394b4 |
5 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
8394b4 |
|
|
|
8394b4 |
diff --git a/docker/389-ds-fedora/Dockerfile b/docker/389-ds-fedora/Dockerfile
|
|
|
8394b4 |
index d61df8cba..45523ccf1 100644
|
|
|
8394b4 |
--- a/docker/389-ds-fedora/Dockerfile
|
|
|
8394b4 |
+++ b/docker/389-ds-fedora/Dockerfile
|
|
|
8394b4 |
@@ -40,7 +40,7 @@ VOLUME /etc/dirsrv
|
|
|
8394b4 |
VOLUME /var/log/dirsrv
|
|
|
8394b4 |
VOLUME /var/lib/dirsrv
|
|
|
8394b4 |
|
|
|
8394b4 |
-# Or, run them as dirsrv
|
|
|
8394b4 |
-USER dirsrv
|
|
|
8394b4 |
-CMD ["/usr/sbin/ns-slapd", "-d", "0", "-D", "/etc/dirsrv/slapd-localhost", "-i", "/var/run/dirsrv/slapd-localhost.pid"]
|
|
|
8394b4 |
+HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \
|
|
|
8394b4 |
+ CMD /usr/libexec/dirsrv/dscontainer -H
|
|
|
8394b4 |
|
|
|
8394b4 |
+CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]
|
|
|
8394b4 |
diff --git a/docker/389-ds-suse/Dockerfile b/docker/389-ds-suse/Dockerfile
|
|
|
8394b4 |
index 1e56e1f5a..6022d04c6 100644
|
|
|
8394b4 |
--- a/docker/389-ds-suse/Dockerfile
|
|
|
8394b4 |
+++ b/docker/389-ds-suse/Dockerfile
|
|
|
8394b4 |
@@ -76,7 +76,7 @@ VOLUME /data
|
|
|
8394b4 |
# USER dirsrv
|
|
|
8394b4 |
|
|
|
8394b4 |
HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \
|
|
|
8394b4 |
- CMD /usr/sbin/dscontainer -H
|
|
|
8394b4 |
+ CMD /usr/libexec/dirsrv/dscontainer -H
|
|
|
8394b4 |
|
|
|
8394b4 |
-CMD [ "/usr/sbin/dscontainer", "-r" ]
|
|
|
8394b4 |
+CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]
|
|
|
8394b4 |
|
|
|
8394b4 |
diff --git a/docker/389-ds-suse/Dockerfile.release b/docker/389-ds-suse/Dockerfile.release
|
|
|
8394b4 |
index c934edaf0..6f4adf735 100644
|
|
|
8394b4 |
--- a/docker/389-ds-suse/Dockerfile.release
|
|
|
8394b4 |
+++ b/docker/389-ds-suse/Dockerfile.release
|
|
|
8394b4 |
@@ -69,4 +69,4 @@ VOLUME /data
|
|
|
8394b4 |
# here and ds should do the right thing if a non root user runs the server.
|
|
|
8394b4 |
# USER dirsrv
|
|
|
8394b4 |
|
|
|
8394b4 |
-CMD [ "/usr/sbin/dscontainer", "-r" ]
|
|
|
8394b4 |
+CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]
|
|
|
8394b4 |
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
|
|
|
8394b4 |
index 6f4a1e1a9..6491bda00 100644
|
|
|
8394b4 |
--- a/rpm/389-ds-base.spec.in
|
|
|
8394b4 |
+++ b/rpm/389-ds-base.spec.in
|
|
|
8394b4 |
@@ -806,7 +806,7 @@ exit 0
|
|
|
8394b4 |
%{_mandir}/man8/dsctl.8.gz
|
|
|
8394b4 |
%{_sbindir}/dsidm
|
|
|
8394b4 |
%{_mandir}/man8/dsidm.8.gz
|
|
|
8394b4 |
-%{_sbindir}/dscontainer
|
|
|
8394b4 |
+%{_libexecdir}/%{pkgname}/dscontainer
|
|
|
8394b4 |
|
|
|
8394b4 |
%files -n cockpit-389-ds -f cockpit.list
|
|
|
8394b4 |
%{_datarootdir}/metainfo/389-console/org.port389.cockpit_console.metainfo.xml
|
|
|
8394b4 |
diff --git a/src/lib389/setup.py b/src/lib389/setup.py
|
|
|
8394b4 |
index 056173936..296b555a4 100644
|
|
|
8394b4 |
--- a/src/lib389/setup.py
|
|
|
8394b4 |
+++ b/src/lib389/setup.py
|
|
|
8394b4 |
@@ -63,7 +63,6 @@ setup(
|
|
|
8394b4 |
'cli/dsconf',
|
|
|
8394b4 |
'cli/dscreate',
|
|
|
8394b4 |
'cli/dsidm',
|
|
|
8394b4 |
- 'cli/dscontainer',
|
|
|
8394b4 |
]),
|
|
|
8394b4 |
('/usr/share/man/man8', [
|
|
|
8394b4 |
'man/dsctl.8',
|
|
|
8394b4 |
@@ -71,6 +70,9 @@ setup(
|
|
|
8394b4 |
'man/dscreate.8',
|
|
|
8394b4 |
'man/dsidm.8',
|
|
|
8394b4 |
]),
|
|
|
8394b4 |
+ ('/usr/libexec/dirsrv/', [
|
|
|
8394b4 |
+ 'cli/dscontainer',
|
|
|
8394b4 |
+ ]),
|
|
|
8394b4 |
],
|
|
|
8394b4 |
|
|
|
8394b4 |
install_requires=[
|
|
|
8394b4 |
--
|
|
|
8394b4 |
2.21.1
|
|
|
8394b4 |
|