[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.ldap-server:1.3 ldap_recipes.mk:1.3 zinstance_recipes.mk:1.5

[Chris McDonough]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv2520

Modified Files:
	Makefile.ldap-server ldap_recipes.mk zinstance_recipes.mk 
Log Message:
Changing ldap stuff for init script as well as adding log rotation to zinstance.


=== NZO_SiteLayout/Makefile.ldap-server 1.2 => 1.3 ===
 #   Add / remove here ass appropriate.
 #-----------------------------------------------------------------------
+ROOT_TARGETS=\
+/etc/rc.d/init.d/ldap
+
 OPT_TARGETS=\
 ${LDAP_SERVER_OPT_TARGETS} \
 


=== NZO_SiteLayout/ldap_recipes.mk 1.2 => 1.3 ===
+
+SEDSCRIPT=\
+-e "\
+s@<<VAR_DIR>>@${BASE_DIR}/var at g;\
+s@<<ETC_DIR>>@${BASE_DIR}/etc at g;\
+s@<<LDAP_ETC_DIR>>@${BASE_DIR}/etc/openldap at g;\
+s@<<BIN_DIR>>@${BASE_DIR}/bin at g;\
+s@<<ROOT_PW>>@${ROOT_PWD}@g;\
+"
 ${LDAP_SRC_TARGETS}: ${BASE_DIR}/src
 	${CD} $< && ${CVS} -d ${CVS_REPOSITORY} checkout ${CVS_TAG} -d ${@F} ${CVS_MODULE}
 
@@ -6,6 +16,7 @@
 	${CD} $@/build && ${BASE_DIR}/$</configure\
          --prefix=${BASE_DIR}/${@}\
          --bindir=${BASE_DIR}/bin\
+         --libexecdir=${BASE_DIR}/bin\
          --sbindir=${BASE_DIR}/bin\
          --sysconfdir=${BASE_DIR}/etc\
          --localstatedir=${BASE_DIR}/var\
@@ -15,6 +26,7 @@
          --with-threads\
          --enable-rlookups\
          --with-gnu-ld
+	${CD} $@/build && ${MAKE} depend
 	${CD} $@/build && ${MAKE}
 	${CD} $@/build && ${MAKE} install
 
@@ -30,9 +42,43 @@
 opt/Python2/lib/python2.1/site-packages/ldap: opt/python-ldap bin/python
 	${CD} $< && ${BASE_DIR}/bin/python setup.py install
 
+etc/openldap/schema/zopeorg.schema: ${MAKEFILEDIR}/etc/zopeorg.schema.in
+etc/openldap/slapd.conf: ${MAKEFILEDIR}/etc/slapd.conf.in
+etc/openldap/seed_ldifs/slapd.conf: ${MAKEFILEDIR}/etc/zope_org.ldif.in
+
+LDAP_CONF_FILES=\
+etc/openldap/schema/zopeorg.schema \
+etc/openldap/slapd.conf \
+
+${LDAP_CONF_FILES}:
+	${MKDIR} ${@D}
+	${SED} ${SEDSCRIPT} < $< > $@
+
+bin/slapctl: ${MAKEFILEDIR}/bin/slapctl.in
+bin/testldap: ${MAKEFILEDIR}/bin/testldap.in
+bin/populate_ldap: ${MAKEFILEDIR}/bin/populate_ldap.in
+
+LDAP_LOCAL_BIN_FILES=\
+bin/slapctl \
+bin/testldap \
+bin/populate_ldap \
+
+${LDAP_LOCAL_BIN_FILES}:
+	${MKDIR} ${@D}
+	${SED} ${SEDSCRIPT} < $< > $@
+	${CHMOD} 755 $@
+
+/etc/rc.d/init.d/ldap: ${MAKEFILEDIR}/rc/ldap.rc.in ldap
+	${SED} ${SEDSCRIPT} < $< > ${MAKEFILEDIR}/ldap.rc.tempfile &&\
+         ${SUDO} mv ${MAKEFILEDIR}/ldap.rc.tempfile $@ &&\
+         ${SUDO} ${CHMOD} 755 $@ && ${SUDO} ${CHOWN} root.root $@ &&\
+         ${SUDO} /sbin/chkconfig --level 2345 ldap on
+
 ldap_usage:
-	@${ECHO} "   libraries -- Build & install ldap package libraries."
+	@${ECHO} "   ldap -- Build & install ldap package libraries."
 	@${ECHO}
+
+ldap: ${LDAP_CONF_FILES} opt/openldap
 
 .PHONY: ldap ldap_usage
 


=== NZO_SiteLayout/zinstance_recipes.mk 1.4 => 1.5 ===
 s@<<ZEO_SERVER_PORT>>@${ZEO_SERVER_PORT}@g;\
 s@<<ZEO_SERVER_STORAGE>>@${ZEO_SERVER_STORAGE}@g;\
-s@<<RUNAS_USER>>@$(shell whoami)@g\
+s@<<RUNAS_USER>>@$(shell whoami)@g;\
+s@<<INSTANCE_ZCTL>>@${BASE_DIR}/bin/zctl-${INSTANCE_NAME}@g\
 "
 AFTERCREATE=${TRUE}
 
@@ -42,6 +43,11 @@
          ${SUDO} mv ${MAKEFILEDIR}/zope.rc.tempfile $@ &&\
          ${SUDO} ${CHMOD} 755 $@ && ${SUDO} ${CHOWN} root.root $@ &&\
          ${SUDO} /sbin/chkconfig --level 2345 zope_${INSTANCE_NAME} on
+
+/etc/logrotate.d/zope_${INSTANCE_NAME}: ${MAKEFILEDIR}/etc/zope_logrotate.d.in
+        ${SED} ${SEDSCRIPT} < $< > ${MAKEFILEDIR}/zlog.rc.tempfile
+	${SUDO} mv ${MAKEFILEDIR}/zlog.rc.tempfile $@
+	${SUDO} ${CHOWN} root.root $@
 
 opt/Python2/lib/python2.1/site-packages/ZopeCtl.py: ${MAKEFILEDIR}/ZopeCtl.py
 	${MKDIR} ${BASE_DIR}/${@D}