389-ds-base

Clone
Source Code
GIT

#50813 Issue 50812 - dscontainer executable should be placed under /usr/libexec/dirsrv/
Closed 3 years ago by spichugi. Opened 4 years ago by mreynolds.
mreynolds/389-ds-base issue50812  into  master

file modified
+2 -2 
@@ -46,6 +46,6 @@ 
 

  #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" ]

file modified
+2 -2 
@@ -76,7 +76,7 @@ 
 

  # 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" ]

file modified
+1 -1 
@@ -69,4 +69,4 @@ 
 

  # 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" ]

file modified
+1 -1 
@@ -808,7 +808,7 @@ 
 

  %{_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

file modified
+3 -1 
@@ -63,7 +63,6 @@ 
 

              'cli/dsconf',
 

              'cli/dscreate',
 

              'cli/dsidm',
 

-             'cli/dscontainer',
 

              ]),
 

          ('/usr/share/man/man8', [
 

              'man/dsctl.8',
 
@@ -71,6 +70,9 @@ 
 

              'man/dscreate.8',
 

              'man/dsidm.8',
 

              ]),
 

+         ('/usr/libexec/dirsrv/', [
 

+             'cli/dscontainer',
 

+             ]),
 

      ],
 

  

      install_requires=[

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

Don't we need to change the dockerfiles too?

rebased onto 43172205e53aac1948f4a899a7ce11444710dd21
4 years ago

Don't we need to change the dockerfiles too?

Umm, yes we do ;-)

Fixed, please review...

LGTM now. :)

rebased onto 74557db
4 years ago

Pull-Request has been merged by mreynolds
4 years ago

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/3867

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi
3 years ago
Metadata
None
No Tags
Changes Summary 5
+2 -2
file changed
docker/389-ds-fedora/Dockerfile
+2 -2
file changed
docker/389-ds-suse/Dockerfile
+1 -1
file changed
docker/389-ds-suse/Dockerfile.release
+1 -1
file changed
rpm/389-ds-base.spec.in
+3 -1
file changed
src/lib389/setup.py
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.