Commit 8c2fc297 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

cleanup slapd.ldif; install it (ITS#7015)

parent f0810d65
...@@ -399,6 +399,10 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_overlays ...@@ -399,6 +399,10 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_overlays
-e "s;%LOCALSTATEDIR%;$$localstatedir;" \ -e "s;%LOCALSTATEDIR%;$$localstatedir;" \
-e "s;%MODULEDIR%;$$moduledir;" \ -e "s;%MODULEDIR%;$$moduledir;" \
$(srcdir)/slapd.conf > slapd.conf.tmp ; \ $(srcdir)/slapd.conf > slapd.conf.tmp ; \
$(SED) -e "s;%SYSCONFDIR%;$$sysconfdir;" \
-e "s;%LOCALSTATEDIR%;$$localstatedir;" \
-e "s;%MODULEDIR%;$$moduledir;" \
$(srcdir)/slapd.ldif > slapd.ldif.tmp ; \
touch all-cffiles touch all-cffiles
install-schema: FORCE install-schema: FORCE
...@@ -424,6 +428,14 @@ install-conf: FORCE ...@@ -424,6 +428,14 @@ install-conf: FORCE
else \ else \
echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \ echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \
fi fi
$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif.default
if test ! -f $(DESTDIR)$(sysconfdir)/slapd.ldif; then \
echo "installing slapd.ldif in $(sysconfdir)"; \
echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif"; \
$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif; \
else \
echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.ldif" ; \
fi
install-db-config: FORCE install-db-config: FORCE
@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
......
...@@ -9,8 +9,8 @@ cn: config ...@@ -9,8 +9,8 @@ cn: config
# #
# Define global ACLs to disable default read access. # Define global ACLs to disable default read access.
# #
olcArgsFile: %LOCALSTATEDIR%/run/slapd.args olcArgsFile: %LOCALSTATEDIR%/run/slapd.args
olcPidFile: %LOCALSTATEDIR%/run/slapd.pid olcPidFile: %LOCALSTATEDIR%/run/slapd.pid
# #
# Do not enable referrals until AFTER you have a working directory # Do not enable referrals until AFTER you have a working directory
# service AND an understanding of referrals. # service AND an understanding of referrals.
...@@ -41,7 +41,7 @@ dn: cn=schema,cn=config ...@@ -41,7 +41,7 @@ dn: cn=schema,cn=config
objectClass: olcSchemaConfig objectClass: olcSchemaConfig
cn: schema cn: schema
include: file:///%SYSCONFDIR%/schema/core.ldif include: file://%SYSCONFDIR%/schema/core.ldif
# Frontend settings # Frontend settings
# #
...@@ -80,15 +80,15 @@ dn: olcDatabase=bdb,cn=config ...@@ -80,15 +80,15 @@ dn: olcDatabase=bdb,cn=config
objectClass: olcDatabaseConfig objectClass: olcDatabaseConfig
objectClass: olcBdbConfig objectClass: olcBdbConfig
olcDatabase: bdb olcDatabase: bdb
olcSuffix: dc=my-domain,dc=com olcSuffix: dc=my-domain,dc=com
olcRootDN: cn=Manager,dc=my-domain,dc=com olcRootDN: cn=Manager,dc=my-domain,dc=com
# Cleartext passwords, especially for the rootdn, should # Cleartext passwords, especially for the rootdn, should
# be avoided. See slappasswd(8) and slapd-config(5) for details. # be avoided. See slappasswd(8) and slapd-config(5) for details.
# Use of strong authentication encouraged. # Use of strong authentication encouraged.
olcRootPW: secret olcRootPW: secret
# The database directory MUST exist prior to running slapd AND # The database directory MUST exist prior to running slapd AND
# should only be accessible by the slapd and slap tools. # should only be accessible by the slapd and slap tools.
# Mode 700 recommended. # Mode 700 recommended.
olcDbDirectory: %LOCALSTATEDIR%/openldap-data olcDbDirectory: %LOCALSTATEDIR%/openldap-data
# Indices to maintain # Indices to maintain
olcDbIndex: objectClass eq olcDbIndex: objectClass eq
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment