From 23b0a9e2bbdcaa0a0d078c023cbd58684fcecdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Mon, 13 Oct 2008 20:52:43 +0000
Subject: [PATCH] LEMONLDAP::NG : put all configuration in /etc/lemonldap-ng/

---
 build/lemonldap-ng/Makefile                   | 38 +++++++--------
 .../_example/etc/lemonldap-ng/apps-list.dtd   | 14 ++++++
 .../_example/etc/lemonldap-ng/apps-list.xml   | 48 +++++++++++++++++++
 .../lib => etc}/lemonldap-ng/conf/lmConf-1    |  0
 4 files changed, 81 insertions(+), 19 deletions(-)
 create mode 100644 build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.dtd
 create mode 100644 build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.xml
 rename build/lemonldap-ng/_example/{var/lib => etc}/lemonldap-ng/conf/lmConf-1 (100%)

diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile
index e7d1c2ca3..f8ecda9dc 100644
--- a/build/lemonldap-ng/Makefile
+++ b/build/lemonldap-ng/Makefile
@@ -10,14 +10,14 @@ DNSDOMAIN="example.com"
 # LDAP parameters
 LDAPHOST="localhost"
 LDAPPORT="389"
-LDAPSUFFIX="dc=example,dc=com"
+LDAPSUFFIX="dc=example,dc=net"
 # Other
 VERSION=`head -n1 changelog |sed -e 's/lemonldap-ng (//' -e 's/).*$$//'`
 SRCHANDLERDIR=lemonldap-ng-handler
 SRCPORTALDIR=lemonldap-ng-portal
 SRCMANAGERDIR=lemonldap-ng-manager
 EXAMPLELANG=en # For static Manager only
-DESTFILECONFDIR=$(SCRIPTSDIR)conf/
+DESTFILECONFDIR=$(SYSTEMCONFDIR)conf/
 DESTSESSIONDIR=$(SCRIPTSDIR)sessions/
 DESTLASPDIR=$(SCRIPTSDIR)liberty-alliance-sp-portal
 DESTPORTALDIR=$(SCRIPTSDIR)portal/
@@ -29,29 +29,29 @@ all:	handler manager portal
 
 handler:	handler_conf
 	@$(MAKE) -C ${SRCHANDLERDIR}
-	@touch .handler
+	@touch handler
 
 portal:		portal_conf
 	@$(MAKE) -C ${SRCPORTALDIR}
-	@touch .portal
+	@touch portal
 
 manager:	manager_conf
 	@$(MAKE) -C ${SRCMANAGERDIR}
-	@touch .manager
+	@touch manager
 
 configure:	handler_conf portal_conf manager_conf
 
 handler_conf:
 	@cd ${SRCHANDLERDIR}; perl Makefile.PL
-	@touch .handler_conf
+	@touch handler_conf
 
 portal_conf:
 	@cd ${SRCPORTALDIR}; perl Makefile.PL
-	@touch .portal_conf
+	@touch portal_conf
 
 manager_conf:
 	@cd ${SRCMANAGERDIR}; perl Makefile.PL
-	@touch .manager_conf
+	@touch manager_conf
 
 test:		manager handler portal manager_test handler_test portal_test
 
@@ -68,15 +68,15 @@ install:	handler_install portal_install manager_install
 
 handler_install:	handler
 	@$(MAKE) -C ${SRCHANDLERDIR} install
-	@touch .handler_install
+	@touch handler_install
 
 portal_install:		portal
 	@$(MAKE) -C ${SRCPORTALDIR} install
-	@touch .portal_install
+	@touch portal_install
 
 manager_install:	manager
 	@$(MAKE) -C ${SRCMANAGERDIR} install
-	@touch .manager_install
+	@touch manager_install
 
 distclean:	clean
 
@@ -87,15 +87,15 @@ clean:		handler_clean portal_clean manager_clean
 
 handler_clean:
 	- $(MAKE) -C ${SRCHANDLERDIR} distclean
-	@rm -vf .handler*
+	@rm -vf handler*
 
 portal_clean:
 	- $(MAKE) -C ${SRCPORTALDIR} distclean
-	@rm -vf .portal*
+	@rm -vf portal*
 
 manager_clean:
 	- $(MAKE) -C ${SRCMANAGERDIR} distclean
-	@rm -vf .manager*
+	@rm -vf manager*
 
 example: all
 	@mkdir -p ${DESTFILECONFDIR} ${DESTPORTALDIR} ${DESTHANDLERDIR} ${DESTMANAGERDIR} ${SYSTEMCONFDIR} ${DESTDOCSDIR} ${DESTSESSIONDIR}
@@ -108,8 +108,8 @@ example: all
 	@cp -a _example/var/lib/lemonldap-ng/* ${SCRIPTSDIR}
 	@cp -a doc/* ${DESTDOCSDIR}
 	@find ${DESTLASPDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${DESTLASPDIR}'#g;s#__CONFDIR__/?#'${DESTFILECONFDIR}'#g' {} \;
-	@find ${SCRIPTSDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${SCRIPTSDIR}'#g;s#__CONFDIR__/?#'${DESTFILECONFDIR}'#g;s#__SESSIONDIR__/?#'${DESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \;
-	@find ${SYSTEMCONFDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${SCRIPTSDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;' {} \;
+	@find ${SCRIPTSDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${SCRIPTSDIR}'#g;s#__SYSCONFDIR__/?#'${SYSTEMCONFDIR}'#g;s#__CONFDIR__/?#'${DESTFILECONFDIR}'#g;s#__SESSIONDIR__/?#'${DESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \;
+	@find ${SYSTEMCONFDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${SCRIPTSDIR}'#g;s#__SESSIONDIR__/?#'${DESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \;
 	@echo
 	@echo "LemonLDAP::NG example v${VERSION} is installed with these parameters:"
 	@echo "  - System configuration: ${SYSTEMCONFDIR}"
@@ -160,15 +160,15 @@ uninstall:	configure handler_uninstall portal_uninstall manager_uninstall
 
 handler_uninstall:	handler
 	@$(MAKE) -C ${SRCHANDLERDIR} uninstall
-	@rm -vf .handler_uninstall
+	@rm -vf handler_uninstall
 
 portal_uninstall:		portal
 	@$(MAKE) -C ${SRCPORTALDIR} uninstall
-	@rm -vf .portal_uninstall
+	@rm -vf portal_uninstall
 
 manager_uninstall:	manager
 	@$(MAKE) -C ${SRCMANAGERDIR} uninstall
-	@rm -vf .manager_uninstall
+	@rm -vf manager_uninstall
 
 dist:	clean
 	@- $(MAKE) clean
diff --git a/build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.dtd b/build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.dtd
new file mode 100644
index 000000000..381a8c1e6
--- /dev/null
+++ b/build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.dtd
@@ -0,0 +1,14 @@
+<!ELEMENT menu (category*) >
+
+<!ELEMENT category (application*, category*) >
+<!ATTLIST category name CDATA #REQUIRED >
+
+<!ELEMENT application (name, uri?, description?, logo?, screenshot?, display?) >
+<!ATTLIST application id ID #REQUIRED >
+
+<!ELEMENT name ( #PCDATA ) >
+<!ELEMENT uri ( #PCDATA ) >
+<!ELEMENT description ( #PCDATA ) >
+<!ELEMENT logo ( #PCDATA ) >
+<!ELEMENT screenshot ( #PCDATA ) >
+<!ELEMENT display ( #PCDATA ) >
diff --git a/build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.xml b/build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.xml
new file mode 100644
index 000000000..5ab7929cd
--- /dev/null
+++ b/build/lemonldap-ng/_example/etc/lemonldap-ng/apps-list.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE menu SYSTEM "apps-list.dtd">
+
+<menu>
+	<category name="Example">
+	<application id="test1">
+		<name>Application Test 1</name>
+		<uri>http://test1.__DNSDOMAIN__</uri>
+		<description>A simple application displaying authenticated user</description>
+		<logo>wheels.png</logo>
+		<display>auto</display>
+	</application>
+	<application id="test2">
+		<name>Application Test 2</name>
+		<uri>http://test2.__DNSDOMAIN__</uri>
+		<description>The same simple application displaying authenticated user</description>
+		<logo>wheels.png</logo>
+		<display>auto</display>
+	</application>
+	</category>
+
+	<category name="Administration">
+	<application id="manager">
+		<name>WebSSO Manager</name>
+		<uri>http://manager.__DNSDOMAIN__</uri>
+		<description>Configure LemonLDAP::NG WebSSO</description>
+		<logo>tools.png</logo>
+		<display>on</display>
+	</application>
+	</category>
+
+	<category name="Documentation">
+	<application id="localdoc">
+		<name>Local documentation</name>
+		<uri>http://manager.__DNSDOMAIN__/docs/</uri>
+		<description>Documentation supplied with LemonLDAP::NG</description>
+		<logo>docs.png</logo>
+		<display>on</display>
+	</application>
+	<application id="officialwebsite">
+		<name>Offical Website</name>
+		<uri>http://wiki.lemonldap.objectweb.org/xwiki/bin/view/NG/Presentation</uri>
+		<description>Official LemonLDAP::NG Website</description>
+		<logo>web.png</logo>
+		<display>on</display>
+	</application>
+	</category>
+</menu>
diff --git a/build/lemonldap-ng/_example/var/lib/lemonldap-ng/conf/lmConf-1 b/build/lemonldap-ng/_example/etc/lemonldap-ng/conf/lmConf-1
similarity index 100%
rename from build/lemonldap-ng/_example/var/lib/lemonldap-ng/conf/lmConf-1
rename to build/lemonldap-ng/_example/etc/lemonldap-ng/conf/lmConf-1