# This container version doesn't actually use or need the pidfile to track
        # the process.

- the ldapi socket is placed into /data so you can access it from the
container host.

        s2b.set('run_dir', '/data/run')
        s2b.set('lock_dir', '/data/run/lock')
        s2b.set('ldapi', '/data/run/slapd.socket')

    ln -s /data/run /var/run/dirsrv

$ podman run -ti opensuse/leap:15.1 /bin/bash
38510bc4b0c1:/ # ls -la /var/ | grep run 
lrwxrwxrwx.  1 root root    9 Jun 22 18:36 lock -> /run/lock
lrwxrwxrwx.  1 root root    4 Jun 22 18:36 run -> /run

From ec475079bf40b31fa4e7fde305c6094058507498 Mon Sep 17 00:00:00 2001
From: Thierry Bordaz <tbordaz@redhat.com>
Date: Thu, 2 Jul 2020 14:43:20 +0200
Subject: [PATCH] ext 51059 prefix install

---
 src/lib389/lib389/instance/options.py | 5 +++++
 src/lib389/lib389/instance/setup.py   | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/lib389/lib389/instance/options.py b/src/lib389/lib389/instance/options.py
index fd60d433c..699f836e2 100644
--- a/src/lib389/lib389/instance/options.py
+++ b/src/lib389/lib389/instance/options.py
@@ -25,6 +25,7 @@ format_keys = [
     'sysconf_dir',
     'data_dir',
     'local_state_dir',
+    'ldapi',
     'lib_dir',
     'cert_dir',
     'config_dir',
@@ -216,6 +217,10 @@ class Slapd2Base(Options2):
         self._type['local_state_dir'] = str
         self._helptext['local_state_dir'] = "Sets the location of Directory Server variable data. Only set this parameter in a development environment."

+        self._options['ldapi'] = ds_paths.ldapi
+        self._type['ldapi'] = str
+        self._helptext['ldapi'] = "Sets the location of socket interface of the Directory Server."
+
         self._options['lib_dir'] = ds_paths.lib_dir
         self._type['lib_dir'] = str
         self._helptext['lib_dir'] = "Sets the location of Directory Server shared libraries. Only set this parameter in a development environment."
diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
index 418b71b57..18563d44a 100644
--- a/src/lib389/lib389/instance/setup.py
+++ b/src/lib389/lib389/instance/setup.py
@@ -966,7 +966,10 @@ class SetupDs(object):
                     raise ValueError("Suffix RDN '{}' in '{}' is not supported.  Supported RDN's are: 'c', 'cn', 'dc', 'o', and 'ou'".format(suffix_rdn_attr, backend['nsslapd-suffix']))

         # Initialise ldapi socket information. IPA expects this ....
-        ldapi_path = os.path.join(slapd['local_state_dir'], "run/slapd-%s.socket" % slapd['instance_name'])
+        if os.path.exists(os.path.dirname(slapd['ldapi'])):
+            ldapi_path = slapd['ldapi']
+        else:
+            ldapi_path = os.path.join(slapd['run_dir'], "/slapd-%s.socket" % slapd['instance_name'])
         ds_instance.config.set('nsslapd-ldapifilepath', ldapi_path)
         ds_instance.config.set('nsslapd-ldapilisten', 'on')
         ds_instance.config.set('nsslapd-ldapiautobind', 'on')

From d835160e133afe52a6caf6a0e429374c6ea6fdba Mon Sep 17 00:00:00 2001
From: Thierry Bordaz <tbordaz@redhat.com>
Date: Thu, 2 Jul 2020 14:43:20 +0200
Subject: [PATCH] ext 51059 prefix install

---
 Makefile.am                                  | 3 ++-
 dirsrvtests/tests/suites/basic/basic_test.py | 4 ++--
 ldap/admin/src/defaults.inf.in               | 4 ++--
 ldap/servers/snmp/main.c                     | 8 ++++----
 src/lib389/lib389/__init__.py                | 3 +++
 src/lib389/lib389/instance/options.py        | 5 +++++
 src/lib389/lib389/instance/setup.py          | 5 ++++-
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3f2164599..0e3c9315d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -141,7 +141,8 @@ PATH_DEFINES = -DLOCALSTATEDIR="\"$(localstatedir)\"" -DSYSCONFDIR="\"$(sysconfd
    -DLIBDIR="\"$(libdir)\"" -DBINDIR="\"$(bindir)\"" \
    -DDATADIR="\"$(datadir)\"" -DDOCDIR="\"$(docdir)\"" \
    -DSBINDIR="\"$(sbindir)\"" -DPLUGINDIR="\"$(serverplugindir)\"" \
-   -DTEMPLATEDIR="\"$(sampledatadir)\"" -DSYSTEMSCHEMADIR="\"$(systemschemadir)\""
+   -DTEMPLATEDIR="\"$(sampledatadir)\"" -DSYSTEMSCHEMADIR="\"$(systemschemadir)\"" \
+   -DLOCALRUNDIR="\"$(localrundir)\""

 # Now that we have all our defines in place, setup the CPPFLAGS

diff --git a/dirsrvtests/tests/suites/basic/basic_test.py b/dirsrvtests/tests/suites/basic/basic_test.py
index c85dc4b43..c9a005a3e 100644
--- a/dirsrvtests/tests/suites/basic/basic_test.py
+++ b/dirsrvtests/tests/suites/basic/basic_test.py
@@ -835,7 +835,6 @@ def test_basic_ldapagent(topology_st, import_example_ldif):
     """

     log.info('Running test_basic_ldapagent...')
-
     var_dir = topology_st.standalone.get_local_state_dir()

     config_file = os.path.join(topology_st.standalone.get_sysconf_dir(), 'dirsrv/config/agent.conf')
@@ -849,7 +848,8 @@ def test_basic_ldapagent(topology_st, import_example_ldif):
     # Remember, this is *forking*
     check_output([os.path.join(topology_st.standalone.get_sbin_dir(), 'ldap-agent'), config_file])
     # First kill any previous agents ....
-    pidpath = os.path.join(var_dir, 'run/ldap-agent.pid')
+    run_dir = topology_st.standalone.get_run_dir()
+    pidpath = os.path.join(run_dir, 'ldap-agent.pid')
     pid = None
     with open(pidpath, 'r') as pf:
         pid = pf.readlines()[0].strip()
diff --git a/ldap/admin/src/defaults.inf.in b/ldap/admin/src/defaults.inf.in
index ccc31ac0b..c1bb97b36 100644
--- a/ldap/admin/src/defaults.inf.in
+++ b/ldap/admin/src/defaults.inf.in
@@ -35,10 +35,10 @@ sysconf_dir = @sysconfdir@
 initconfig_dir = @initconfigdir@
 config_dir = @instconfigdir@/slapd-{instance_name}
 local_state_dir = @localstatedir@
-run_dir = @localrundir@/dirsrv
+run_dir = @localrundir@
 # This is the expected location of ldapi.
 ldapi = @localrundir@/slapd-{instance_name}.socket
-pid_file = @localrundir@/dirsrv/slapd-{instance_name}.pid
+pid_file = @localrundir@/slapd-{instance_name}.pid
 inst_dir = @serverdir@/slapd-{instance_name}
 plugin_dir = @serverplugindir@
 system_schema_dir = @systemschemadir@
diff --git a/ldap/servers/snmp/main.c b/ldap/servers/snmp/main.c
index 4b672ead0..e5beb3cc2 100644
--- a/ldap/servers/snmp/main.c
+++ b/ldap/servers/snmp/main.c
@@ -286,14 +286,14 @@ load_config(char *conf_path)
     }

     /* set pidfile path */
-    if ((pidfile = malloc(strlen(LOCALSTATEDIR) + strlen("/run/") +
+    if ((pidfile = malloc(strlen(LOCALRUNDIR) + strlen("/") +
                           strlen(LDAP_AGENT_PIDFILE) + 1)) != NULL) {
-        strncpy(pidfile, LOCALSTATEDIR, strlen(LOCALSTATEDIR) + 1);
+        strncpy(pidfile, LOCALRUNDIR, strlen(LOCALRUNDIR) + 1);
         /* The above will likely not be NULL terminated, but we need to
          * be sure that we're properly NULL terminated for the below
          * strcat() to work properly. */
-        pidfile[strlen(LOCALSTATEDIR)] = (char)0;
-        strcat(pidfile, "/run/");
+        pidfile[strlen(LOCALRUNDIR)] = (char)0;
+        strcat(pidfile, "/");
         strcat(pidfile, LDAP_AGENT_PIDFILE);
     } else {
         printf("ldap-agent: malloc error processing config file\n");
diff --git a/src/lib389/lib389/__init__.py b/src/lib389/lib389/__init__.py
index 8c3e7c338..3c0333143 100644
--- a/src/lib389/lib389/__init__.py
+++ b/src/lib389/lib389/__init__.py
@@ -1699,6 +1699,9 @@ class DirSrv(SimpleLDAPObject, object):
     def get_bin_dir(self):
         return self.ds_paths.bin_dir

+    def get_run_dir(self):
+        return self.ds_paths.run_dir
+
     def get_plugin_dir(self):
         return self.ds_paths.plugin_dir

diff --git a/src/lib389/lib389/instance/options.py b/src/lib389/lib389/instance/options.py
index fd60d433c..699f836e2 100644
--- a/src/lib389/lib389/instance/options.py
+++ b/src/lib389/lib389/instance/options.py
@@ -25,6 +25,7 @@ format_keys = [
     'sysconf_dir',
     'data_dir',
     'local_state_dir',
+    'ldapi',
     'lib_dir',
     'cert_dir',
     'config_dir',
@@ -216,6 +217,10 @@ class Slapd2Base(Options2):
         self._type['local_state_dir'] = str
         self._helptext['local_state_dir'] = "Sets the location of Directory Server variable data. Only set this parameter in a development environment."

+        self._options['ldapi'] = ds_paths.ldapi
+        self._type['ldapi'] = str
+        self._helptext['ldapi'] = "Sets the location of socket interface of the Directory Server."
+
         self._options['lib_dir'] = ds_paths.lib_dir
         self._type['lib_dir'] = str
         self._helptext['lib_dir'] = "Sets the location of Directory Server shared libraries. Only set this parameter in a development environment."
diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
index 418b71b57..bf97bf1a5 100644
--- a/src/lib389/lib389/instance/setup.py
+++ b/src/lib389/lib389/instance/setup.py
@@ -966,7 +966,10 @@ class SetupDs(object):
                     raise ValueError("Suffix RDN '{}' in '{}' is not supported.  Supported RDN's are: 'c', 'cn', 'dc', 'o', and 'ou'".format(suffix_rdn_attr, backend['nsslapd-suffix']))

         # Initialise ldapi socket information. IPA expects this ....
-        ldapi_path = os.path.join(slapd['local_state_dir'], "run/slapd-%s.socket" % slapd['instance_name'])
+        if os.path.exists(os.path.dirname(slapd['ldapi'])):
+            ldapi_path = slapd['ldapi']
+        else:
+            ldapi_path = os.path.join(slapd['run_dir'], "slapd-%s.socket" % slapd['instance_name'])
         ds_instance.config.set('nsslapd-ldapifilepath', ldapi_path)
         ds_instance.config.set('nsslapd-ldapilisten', 'on')
         ds_instance.config.set('nsslapd-ldapiautobind', 'on')

pid_file = @localrundir@/slapd-{instance_name}.pid

pid_file = @localstatedir@/run/dirsrv/slapd-{instance_name}.pid

pid_file = @localrundir@/dirsrv/slapd-{instance_name}.pid