From fdbd8705ae9ace55a94d4af8eb14990920da8dc5 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 19 Dec 2003 02:18:29 +0000 Subject: [PATCH] Move pid/args files into $(RUNDIR)/run Move ldapi into $(RUNDIR)/run/openldap --- include/ldap_defaults.h | 3 ++- servers/slapd/Makefile.in | 2 +- servers/slapd/slapd.conf | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h index 922e0d030d..91b73336be 100644 --- a/include/ldap_defaults.h +++ b/include/ldap_defaults.h @@ -39,7 +39,8 @@ #define LDAP_ENV_PREFIX "LDAP" /* default ldapi:// socket */ -#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "ldapi" +#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" \ + LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi" /* * SLAPD DEFINITIONS diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 7dfe72d35e..26988f2c73 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -343,7 +343,7 @@ install-local-srv: install-slapd install-conf install-schema install-tools install-slapd: FORCE -$(MKDIR) $(DESTDIR)$(libexecdir) - -$(MKDIR) $(DESTDIR)$(localstatedir) + -$(MKDIR) $(DESTDIR)$(localstatedir)/run/openldap $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \ slapd$(EXEEXT) $(DESTDIR)$(libexecdir) @for i in $(SUBDIRS); do \ diff --git a/servers/slapd/slapd.conf b/servers/slapd/slapd.conf index 6ea1eab79d..f7f251113d 100644 --- a/servers/slapd/slapd.conf +++ b/servers/slapd/slapd.conf @@ -10,8 +10,8 @@ include %SYSCONFDIR%/schema/core.schema # service AND an understanding of referrals. #referral ldap://root.openldap.org -pidfile %LOCALSTATEDIR%/slapd.pid -argsfile %LOCALSTATEDIR%/slapd.args +pidfile %LOCALSTATEDIR%/run/slapd.pid +argsfile %LOCALSTATEDIR%/run/slapd.args # Load dynamic backend modules: # modulepath %MODULEDIR% -- 2.39.5