This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.2
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.2 by this push:
new 22d53d0 Issue 50812 - dscontainer executable should be placed under
/usr/libexec/dirsrv/
22d53d0 is described below
commit 22d53d0cb3dabf8f9044daf967d1554b99ed7986
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Mon Jan 13 14:40:49 2020 -0500
Issue 50812 - dscontainer executable should be placed under /usr/libexec/dirsrv/
Description: dscontainer is not a user-runnable executable. Per packaging
guidelines it should be placed under /usr/libexec/dirsrv/
relates:
https://pagure.io/389-ds-base/issue/50812
Reviewed by: firstyear & mhonek (Thanks!!)
---
docker/389-ds-fedora/Dockerfile | 4 ++--
docker/389-ds-suse/Dockerfile | 4 ++--
docker/389-ds-suse/Dockerfile.release | 2 +-
rpm/389-ds-base.spec.in | 2 +-
src/lib389/setup.py | 4 +++-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/docker/389-ds-fedora/Dockerfile b/docker/389-ds-fedora/Dockerfile
index ba901e1..bdd56fd 100644
--- a/docker/389-ds-fedora/Dockerfile
+++ b/docker/389-ds-fedora/Dockerfile
@@ -46,6 +46,6 @@ VOLUME /data
#USER dirsrv
HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \
- CMD /usr/sbin/dscontainer -H
+ CMD /usr/libexec/dirsrv/dscontainer -H
-CMD [ "/usr/sbin/dscontainer", "-r" ]
+CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]
diff --git a/docker/389-ds-suse/Dockerfile b/docker/389-ds-suse/Dockerfile
index 1e56e1f..6022d04 100644
--- a/docker/389-ds-suse/Dockerfile
+++ b/docker/389-ds-suse/Dockerfile
@@ -76,7 +76,7 @@ VOLUME /data
# USER dirsrv
HEALTHCHECK --start-period=5m --timeout=5s --interval=5s --retries=2 \
- CMD /usr/sbin/dscontainer -H
+ CMD /usr/libexec/dirsrv/dscontainer -H
-CMD [ "/usr/sbin/dscontainer", "-r" ]
+CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]
diff --git a/docker/389-ds-suse/Dockerfile.release
b/docker/389-ds-suse/Dockerfile.release
index c934eda..6f4adf7 100644
--- a/docker/389-ds-suse/Dockerfile.release
+++ b/docker/389-ds-suse/Dockerfile.release
@@ -69,4 +69,4 @@ VOLUME /data
# here and ds should do the right thing if a non root user runs the server.
# USER dirsrv
-CMD [ "/usr/sbin/dscontainer", "-r" ]
+CMD [ "/usr/libexec/dirsrv/dscontainer", "-r" ]
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 481d349..a235396 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -808,7 +808,7 @@ exit 0
%{_mandir}/man8/dsctl.8.gz
%{_sbindir}/dsidm
%{_mandir}/man8/dsidm.8.gz
-%{_sbindir}/dscontainer
+%{_libexecdir}/%{pkgname}/dscontainer
%files -n cockpit-389-ds -f cockpit.list
%{_datarootdir}/metainfo/389-console/org.port389.cockpit_console.metainfo.xml
diff --git a/src/lib389/setup.py b/src/lib389/setup.py
index 123348a..e76b660 100644
--- a/src/lib389/setup.py
+++ b/src/lib389/setup.py
@@ -63,7 +63,6 @@ setup(
'cli/dsconf',
'cli/dscreate',
'cli/dsidm',
- 'cli/dscontainer',
]),
('/usr/share/man/man8', [
'man/dsctl.8',
@@ -71,6 +70,9 @@ setup(
'man/dscreate.8',
'man/dsidm.8',
]),
+ ('/usr/libexec/dirsrv/', [
+ 'cli/dscontainer',
+ ]),
],
install_requires=[
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.