From 8e6c8de591ecb6b5f597e2b120094c1928b7a49c Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Wed, 24 Dec 2008 08:32:11 +0000 Subject: [PATCH] LEMONLDAP::NG : I think version 0.9.3 is ready... --- build/lemonldap-ng/Makefile | 22 +++++++++++++++---- .../lemonldap-ng/debian/lemonldap-ng.examples | 1 - build/lemonldap-ng/debian/rules | 2 +- modules/lemonldap-ng-common/MANIFEST | 1 + modules/lemonldap-ng-portal/MANIFEST | 2 ++ 5 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 build/lemonldap-ng/debian/lemonldap-ng.examples diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile index d9d340e3b..f5d88028d 100644 --- a/build/lemonldap-ng/Makefile +++ b/build/lemonldap-ng/Makefile @@ -166,7 +166,7 @@ manager_install_libs: manager @$(MAKE) -C ${SRCMANAGERDIR} install example: - @$(MAKE) -f $(MAKEFILE) install_site LMPREFIX=$(EXAMPLEROOT) + $(MAKE) install_site LMPREFIX=$(EXAMPLEROOT) install_bin: install_libs install_conf_dir # Binary install @@ -231,7 +231,7 @@ install_manager_site: install_conf_dir @find ${RMANAGERDIR} -type l -name imgs -delete @find ${RMANAGERDIR} -type l -name images -delete @cp -pR --remove-destination ${SRCMANAGERDIR}example/* ${RMANAGERDIR} - @rm -rf $$(find ${RMANAGERDIR} -type d -name .svn) ${RMANAGERDIR}scripts ${RMANAGERDIR}mrtg + @rm -rf $$(find ${RMANAGERDIR} -type d -name .svn) ${RMANAGERDIR}scripts ${RMANAGERDIR}mrtg ${RMANAGERDIR}soapserver.pl @if [ "${RMANAGERDIR}imgs/" != "${RMANAGERDATADIR}" ]; then \ mv -f ${RMANAGERDIR}imgs/* ${RMANAGERDATADIR}; \ rm -rf ${RMANAGERDIR}imgs; \ @@ -248,6 +248,9 @@ install_manager_site: install_conf_dir rm -rf ${RMANAGERDIR}images; \ ln -s $$(echo ${SESSIONSEXPLORERDATADIR} | sed -e 's/\/$$//') ${RMANAGERDIR}images; \ fi + @rm -rf $$(find ${RMANAGERDIR} ${RMANAGERDATADIR} \ + ${RSESSIONSEXPLORERDIR} $(RSESSIONSEXPLORERDATADIR) \ + $(RCONFDIR) -type d -name .svn) install_portal_site: install_conf_dir # Portal install @@ -277,18 +280,21 @@ install_portal_site: install_conf_dir # Cron files @cp --remove-destination lemonldap-ng-portal/example/scripts/purgeCentralCache.cron.d $(RCRONDIR) # Clean SVN files - @rm -rf $$(find ${RPORTALDIR} $(RPORTALSKINSDIR) $(RLASPPORTALDIR) -type d -name .svn) + @rm -rf $$(find ${RPORTALDIR} $(RPORTALSKINSDIR) $(RLASPPORTALDIR) $(RCRONDIR) $(RCONFDIR) -type d -name .svn) install_handler_site: install_conf_dir # Handler install @install -v -d ${RHANDLERDIR} @cp --remove-destination ${SRCHANDLERDIR}/example/MyHandler.pm ${RHANDLERDIR} + @rm -rf $$(find $(RHANDLERDIR) -type d -name .svn) install_test_site: # Test site install @install -v -d $(RTESTDIR) @cp -pR --remove-destination _example/test/* $(RTESTDIR) + @rm -rf $$(find $(RTESTDIR) -type d -name .svn) @perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(RTESTDIR)index.pl + @rm -rf $$(find $(RTESTDIR) -type d -name .svn) install_examples_site: # Examples install @@ -299,13 +305,20 @@ install_examples_site: @rm -rf $(REXAMPLESDIR)portal/skins \ $(REXAMPLESDIR)manager/imgs \ $(REXAMPLESDIR)manager/images \ + @rm -rf $$(find $(REXAMPLESDIR) -type d -name .svn) + @perl -i -pe 's#__DIR__#$(LASPPORTALDIR)#g' $(REXAMPLESDIR)portal/AuthLA/index.pl + @perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g' $(REXAMPLESDIR)manager/apply.conf + @perl -i -pe 's#__APPLYCONFFILE__#$(CONFDIR)apply.conf#' $(REXAMPLESDIR)manager/*.pl + @perl -i -pe 's#__SKINDIR__#$(PORTALDIR)skins#; \ + s#__APPSXMLFILE__#$(CONFDIR)apps-list.xml#; \ + s#__SESSIONDIR__#$(APACHESESSIONFILEDIR)#g;' $(REXAMPLESDIR)portal/*.pl install_conf_dir: install_sessions_dir # Configuration files install @install -v -d $(RCONFDIR) $(RFILECONFIGDIR) $(RTOOLSDIR) @cp --remove-destination $(SRCCOMMONDIR)storage.conf $(RCONFDIR) @cp _example/conf/lmConf-1 $(RFILECONFIGDIR) - perl -000 -i -pe "s#^(globalStorageOptions\\n\\s+)'[^\\n]*?'\$$#\$${1}\'\\$$data1 = {&39;Directory&39; => &39;$(APACHESESSIONFILEDIR)&39;,&39;LockDirectory&39; => &39;$(APACHESESSIONFILELOCKDIR)&39;};'#m" $(RFILECONFIGDIR)lmConf-1 + @perl -000 -i -pe "s#^(globalStorageOptions\\n\\s+)'[^\\n]*?'\$$#\$${1}\'\\\$$data1 = {&39;Directory&39; => &39;$(APACHESESSIONFILEDIR)&39;,&39;LockDirectory&39; => &39;$(APACHESESSIONFILELOCKDIR)&39;};'#m" $(RFILECONFIGDIR)lmConf-1 @perl -i -pe 's/__DNSDOMAIN__/$(DNSDOMAIN)/g;\ s/__LDAPPORT__/$(LDAPPORT)/g;\ s/__LDAPHOST__/$(LDAPHOST)/g;\ @@ -321,6 +334,7 @@ install_conf_dir: install_sessions_dir chmod 777 $(RFILECONFIGDIR); \ fi @cp lemonldap-ng-common/tools/lmConfig.mysql lemonldap-ng-common/tools/apache-session-mysql.sql $(RTOOLSDIR) + @rm -rf $$(find $(RCONFDIR) $(RFILECONFIGDIR) $(RTOOLSDIR) -type d -name .svn) install_sessions_dir: @install -m 777 -v -d $(RAPACHESESSIONFILEDIR) $(RAPACHESESSIONFILELOCKDIR) diff --git a/build/lemonldap-ng/debian/lemonldap-ng.examples b/build/lemonldap-ng/debian/lemonldap-ng.examples deleted file mode 100644 index 0b8503d93..000000000 --- a/build/lemonldap-ng/debian/lemonldap-ng.examples +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/var/lib/lemonldap-ng/test/index.pl diff --git a/build/lemonldap-ng/debian/rules b/build/lemonldap-ng/debian/rules index ee0ba5661..497c83c55 100755 --- a/build/lemonldap-ng/debian/rules +++ b/build/lemonldap-ng/debian/rules @@ -76,7 +76,7 @@ install: build $(CURDIR)/debian/tmp$(LMVARDIR)manager/jquery.js \ debian/tmp/examples/manager/jquery.js perl -i -pe 's#(["'"'"'])[\w-\./]*jquery.js#$$1/javascript/jquery/jquery.js#' \ - $(CURDIR)$(LMVARDIR)manager/sessions.pl \ + $(CURDIR)/debian/tmp/examples/$(LMVARDIR)manager/*.pl \ $(CURDIR)/debian/tmp$(LMSHAREDIR)portal-skins/pastel/header.tpl # postinst provides initial portal, manager and sessions-explorer rm -f debian/tmp/var/lib/lemonldap-ng/portal/index.pl \ diff --git a/modules/lemonldap-ng-common/MANIFEST b/modules/lemonldap-ng-common/MANIFEST index 1ffa20329..58026dc0d 100644 --- a/modules/lemonldap-ng-common/MANIFEST +++ b/modules/lemonldap-ng-common/MANIFEST @@ -19,4 +19,5 @@ t/02-Manager-Conf-File.t t/03-Manager-Conf-DBI.t t/04-Manager-Conf-SOAP.t t/10-Common.t +tools/apache-session-mysql.sql tools/lmConfig.mysql diff --git a/modules/lemonldap-ng-portal/MANIFEST b/modules/lemonldap-ng-portal/MANIFEST index 7536bb02a..4e17faa8d 100644 --- a/modules/lemonldap-ng-portal/MANIFEST +++ b/modules/lemonldap-ng-portal/MANIFEST @@ -60,6 +60,7 @@ example/skins/pastel/favicon.ico example/skins/pastel/footer.tpl example/skins/pastel/hatch.gif example/skins/pastel/header.tpl +example/skins/pastel/key.png example/skins/pastel/jquery-tabs.js example/skins/pastel/jquery.js example/skins/pastel/lock.png @@ -69,6 +70,7 @@ example/skins/pastel/notification.tpl example/skins/pastel/ok.png example/skins/pastel/stop.png example/skins/pastel/styles.css +example/skins/pastel/user_suit.png example/skins/pastel/valid-xhtml10-blue.png example/skins/pastel/vcard_edit.png example/skins/pastel/vcss-blue.gif