diff --git a/build/lemonldap-ng/INSTALL b/build/lemonldap-ng/INSTALL
index e06d6177c..db738a904 100644
--- a/build/lemonldap-ng/INSTALL
+++ b/build/lemonldap-ng/INSTALL
@@ -78,7 +78,7 @@ Modify your /etc/hosts file to include:
Edit /path/to/lemonldap-ng/source/example/conf/lmConfig-1 and specify your LDAP
settings. If you don't set managerDn and managerPassword, Lemonldap::NG will
use an anonymous bind to find user dn.
-(Debian users: /usr/share/doc/lemonldap-ng/example/conf/lmConfig-1)
+(Debian users: /var/lib/lemonldap-ng/conf/lmConfig-1)
WARNINGS:
* only few parameters can be set by hand in the configuration file. You have
to use the manager to change configuration, but since the example is yet
diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile
index 14d0679fb..e32fb07b9 100644
--- a/build/lemonldap-ng/Makefile
+++ b/build/lemonldap-ng/Makefile
@@ -6,6 +6,7 @@ PORTALDIR=lemonldap-ng-portal
MANAGERDIR=lemonldap-ng-manager
EXAMPLEDIRBUILD=`pwd`/example/
EXAMPLEDIR=$(EXAMPLEDIRBUILD)
+EXAMPLECONFDIR=$(EXAMPLEDIR)conf/
EXAMPLELANG=en
all: handler manager portal
@@ -82,11 +83,11 @@ manager_clean:
example: all
mkdir -p example/portal example/manager example/handler example/conf
chmod 1777 example/conf
- cp -a ${HANDLERDIR}/example/* example/handler
- cp -a ${PORTALDIR}/example/* example/portal
- cp -a ${MANAGERDIR}/example/* example/manager
- cp -a _example/* example
- find ${EXAMPLEDIRBUILD} -type f -exec perl -i -pe 's#__DIR__/?#'${EXAMPLEDIR}'#g' {} \;
+ cp -a ${HANDLERDIR}/example/* ${EXAMPLEDIRBUILD}/handler
+ cp -a ${PORTALDIR}/example/* ${EXAMPLEDIRBUILD}/portal
+ cp -a ${MANAGERDIR}/example/* ${EXAMPLEDIRBUILD}/manager
+ cp -a _example/* ${EXAMPLEDIRBUILD}
+ find ${EXAMPLEDIRBUILD} -type f -exec perl -i -pe 's#__DIR__/?#'${EXAMPLEDIR}'#g;s#__CONFDIR__/?#'${EXAMPLECONFDIR}'#g;' {} \;
@echo
@echo "Example is ready."
@echo
@@ -101,7 +102,7 @@ example: all
@echo
@echo "2 - Add test.example.com and auth.example.com in yout /etc/hosts :"
@echo
- @echo " cat example/for_etc_hosts >> /etc/hosts"
+ @echo " cat ${EXAMPLEDIRBUILD}/for_etc_hosts >> /etc/hosts"
@echo
@echo "3 - edit ${EXAMPLEDIR}/conf/lmConf-1 and set ldapServer and ldapBase."
@echo " or use the manager at http://manager.example.com/ (after apache restart)"
@@ -147,7 +148,7 @@ manager_cpan: manager_conf
mv ${MANAGERDIR}/Lemonldap*.gz .
static_example: example
- mkdir -p example/static
- cd example/static/;ln -s ../manager/imgs;cd -
- scripts/make_static_example.pl example/manager/index.pl example/static/index.html $(EXAMPLELANG)
+ mkdir -p ${EXAMPLEDIRBUILD}/static
+ cd ${EXAMPLEDIRBUILD}/static/;ln -s ../manager/imgs;cd -
+ scripts/make_static_example.pl ${EXAMPLEDIRBUILD}/manager/index.pl ${EXAMPLEDIRBUILD}/static/index.html $(EXAMPLELANG)
diff --git a/build/lemonldap-ng/TODO b/build/lemonldap-ng/TODO
index 8603ba6a1..821d15bd4 100644
--- a/build/lemonldap-ng/TODO
+++ b/build/lemonldap-ng/TODO
@@ -6,7 +6,9 @@ TODO list for Lemonldap::NG development
Buttons to manage configurations (delete, next, previous, last,...)
- Priority: Normal Status: In progress Created: 2007\04\21 13-05-54
Help in english
-- Priority: Low Status: N/A Created: 2007\04\21 13-14-55
+- Priority: Low Status: Planning Created: 2007\04\21 13-14-55
Simplified manager interface fo rules:
* simplified regexp (* instead of .*,...)
* simple combobox to choose groups
+- Priority: Low Status: Planning Created: 2007\04\23 21-26-18
+TLS in LDAP connection. SSL works, but start_tls cannot yet be called.
diff --git a/build/lemonldap-ng/debian/changelog b/build/lemonldap-ng/debian/changelog
index 35f4fc709..5168df43d 100644
--- a/build/lemonldap-ng/debian/changelog
+++ b/build/lemonldap-ng/debian/changelog
@@ -3,8 +3,12 @@ lemonldap-ng (0.8.1.2) unstable; urgency=low
* Little bug fix if whatToTrace parameter is not defined and display it in
Manager interface
* New: port is now checked in portal redirection
+ * Different configurations can now be used on the same server at the same
+ time
+ * New debian structure: lemonldap-ng is splitted in 5 packages and default
+ configuration file has moved to /var/lib/lemonldap-ng/conf/
- -- Xavier Guimard Mon, 23 Apr 2007 21:20:24 +0200
+ -- Xavier Guimard Sun, 29 Apr 2007 14:00:39 +0200
lemonldap-ng (0.8.1.1) unstable; urgency=low
diff --git a/build/lemonldap-ng/debian/control b/build/lemonldap-ng/debian/control
index 86143766b..d6b217baa 100644
--- a/build/lemonldap-ng/debian/control
+++ b/build/lemonldap-ng/debian/control
@@ -7,11 +7,39 @@ Standards-Version: 3.7.2
Package: lemonldap-ng
Architecture: all
-Depends: libapache-session-perl, libnet-ldap-perl, libdbi-perl, libwww-perl, libcache-cache-perl, libxml-simple-perl
-Provides: liblemonldap-ng-manager-perl, liblemonldap-ng-portal-perl, liblemonldap-ng-manager-perl
-Conflicts: liblemonldap-ng-manager-perl, liblemonldap-ng-portal-perl, liblemonldap-ng-manager-perl
-Recommends: libsoap-lite-perl, liblasso-perl
+Depends: liblemonldap-ng-handler-perl, liblemonldap-ng-manager-perl, liblemonldap-ng-portal-perl
Description: Lemonldap::NG Web-SSO system
Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
or directly on application apache servers.
+Package: liblemonldap-ng-handler-perl
+Architecture: all
+Depends: libapache-session-perl, libwww-perl, libcache-cache-perl, liblemonldap-ng-manager-conf-perl
+Description: Lemonldap::NG apache module part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application apache servers.
+
+Package: liblemonldap-ng-manager-conf-perl
+Architecture: all
+Depends: libdbi-perl
+Recommends: libsoap-lite-perl
+Description: Lemonldap::NG apache manager part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application apache servers.
+
+Package: liblemonldap-ng-manager-perl
+Architecture: all
+Depends: libxml-simple-perl, liblemonldap-ng-manager-conf-perl
+Recommends: libcache-cache-perl, libapache-session-perl, libsoap-lite-perl
+Description: Lemonldap::NG apache manager part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application apache servers.
+
+Package: liblemonldap-ng-portal-perl
+Architecture: all
+Depends: libapache-session-perl, libnet-ldap-perl, liblemonldap-ng-manager-conf-perl
+Recommends: liblasso-perl
+Description: Lemonldap::NG apache authentication portal part
+ Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
+ or directly on application apache servers.
+
diff --git a/build/lemonldap-ng/debian/lemonldap-ng.examples b/build/lemonldap-ng/debian/lemonldap-ng.examples
new file mode 100644
index 000000000..0bbe99ef5
--- /dev/null
+++ b/build/lemonldap-ng/debian/lemonldap-ng.examples
@@ -0,0 +1 @@
+example/*
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.examples b/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.examples
new file mode 100644
index 000000000..6e3f4834e
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.examples
@@ -0,0 +1 @@
+example/handler/
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.install b/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.install
new file mode 100644
index 000000000..5ee546772
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-handler-perl.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/perl5/Lemonldap/NG/Handler*
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Handler*
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.config b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.config
new file mode 100644
index 000000000..428c13612
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.config
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+. /usr/share/debconf/confmodule
+db_input high liblemonldap-ng-manager-conf-perl/newDirInfo || true
+db_go || true
+
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.dirs b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.dirs
new file mode 100644
index 000000000..ecae2caf4
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.dirs
@@ -0,0 +1,2 @@
+/var/lib/lemonldap-ng
+
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.examples b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.examples
new file mode 100644
index 000000000..cf61061d7
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.examples
@@ -0,0 +1,3 @@
+example/conf/
+example/apache-session-mysql.sql
+example/lmConfig.mysql
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.install b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.install
new file mode 100644
index 000000000..d68fa2dc7
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.install
@@ -0,0 +1,5 @@
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Conf*
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Conf*
+debian/tmp/usr/share/man/man1/lmConfig_File2MySQL.1p
+debian/tmp/usr/bin/lmConfig_File2MySQL
+example/conf /var/lib/lemonldap-ng/
diff --git a/build/lemonldap-ng/debian/postinst b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.postinst
similarity index 80%
rename from build/lemonldap-ng/debian/postinst
rename to build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.postinst
index 98f530d77..08df1a95b 100755
--- a/build/lemonldap-ng/debian/postinst
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.postinst
@@ -1,7 +1,10 @@
#!/bin/bash
# Maintainer: #DEBHELPER#
+. /usr/share/debconf/confmodule
+
if [ "$1" = "configure" ]
then
chown -R www-data /usr/share/doc/lemonldap-ng/examples/conf
fi
+
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.templates b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.templates
new file mode 100644
index 000000000..8c1fc0365
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-conf-perl.templates
@@ -0,0 +1,5 @@
+Template: liblemonldap-ng-manager-conf-perl/newDirInfo
+Type: note
+Description: Lemonldap::NG default configuration directory has moved to /var/lib/lemondap-ng/conf/
+Description-fr: Le répertoire de configuration par défaut est maintenant /var/lib/lemondap-ng/conf/
+
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples
new file mode 100644
index 000000000..301491514
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.examples
@@ -0,0 +1 @@
+example/manager
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install
new file mode 100644
index 000000000..9c9785bde
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.install
@@ -0,0 +1,13 @@
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager.pm
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/_i18n.pm
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Help.pm
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Base.pm
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/_HTML.pm
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/SOAPServer.pm
+debian/tmp/usr/share/perl5/Lemonldap/NG/Manager/Restricted.pm
+debian/tmp/usr/share/perl5/auto/Lemonldap/NG/Manager
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Base.3pm
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager.3pm
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::SOAPServer.3pm
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Apache::Session::SOAP.3pm
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Manager::Restricted.3pm
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.examples b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.examples
new file mode 100644
index 000000000..e3d2151b0
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.examples
@@ -0,0 +1 @@
+example/portal
diff --git a/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.install b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.install
new file mode 100644
index 000000000..4da24ec6f
--- /dev/null
+++ b/build/lemonldap-ng/debian/liblemonldap-ng-portal-perl.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/perl5/Lemonldap/NG/Portal*
+debian/tmp/usr/share/perl5/auto/Lemonldap/NG/Portal
+debian/tmp/usr/share/man/man3/Lemonldap::NG::Portal*
diff --git a/build/lemonldap-ng/debian/rules b/build/lemonldap-ng/debian/rules
index a8429a89e..4ae0f1f77 100755
--- a/build/lemonldap-ng/debian/rules
+++ b/build/lemonldap-ng/debian/rules
@@ -27,7 +27,6 @@ build-stamp: configure-stamp
# Add here commands to compile the package.
$(MAKE) INSTALLDIRS=vendor
- #docbook-to-man debian/lemonldap-ng.sgml > lemonldap-ng.1
touch $@
@@ -49,8 +48,8 @@ install: build
# Add here commands to install the package into debian/lemonldap-ng.
$(MAKE) test
- $(MAKE) install DESTDIR=$(CURDIR)/debian/lemonldap-ng PREFIX=/usr
- $(MAKE) example EXAMPLEDIR=/usr/share/doc/lemonldap-ng/examples/
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
+ $(MAKE) example EXAMPLEDIR=/usr/share/doc/lemonldap-ng/examples/ EXAMPLECONFDIR=/var/lib/lemonldap-ng/conf
# Build architecture-independent files here.
@@ -63,10 +62,10 @@ binary-arch: build install
dh_testroot
dh_installchangelogs
dh_installdocs
- dh_installexamples example/*
-# dh_install
+ dh_installexamples
+ dh_install
# dh_installmenu
-# dh_installdebconf
+ dh_installdebconf
# dh_installlogrotate
# dh_installemacsen
# dh_installpam
diff --git a/build/lemonldap-ng/doc/install.html b/build/lemonldap-ng/doc/install.html
index df022102d..0643ce2b0 100644
--- a/build/lemonldap-ng/doc/install.html
+++ b/build/lemonldap-ng/doc/install.html
@@ -100,7 +100,7 @@ package for Debian works fine).
$ tar xzf lemonldap-ng-*.tar.gz
$ cd lemonldap-ng-*
$ debuild # or fakeroot dpkg-buildpackage
- $ sudo dpkg -i ../lemonldap-ng*.deb
+ $ sudo dpkg -i ../*lemonldap-ng*.deb
diff --git a/modules/lemonldap-ng-handler/example/MyHandler.pm b/modules/lemonldap-ng-handler/example/MyHandler.pm
index 0e64d2154..272cad44e 100644
--- a/modules/lemonldap-ng-handler/example/MyHandler.pm
+++ b/modules/lemonldap-ng-handler/example/MyHandler.pm
@@ -11,7 +11,7 @@ __PACKAGE__->init ( {
configStorage => {
type => 'File',
- dirName => '__DIR__/conf',
+ dirName => '__CONFDIR__',
},
https => 0,
diff --git a/modules/lemonldap-ng-handler/example/autoProtectedCGI.pl b/modules/lemonldap-ng-handler/example/autoProtectedCGI.pl
index 29c8653bf..d1c544332 100644
--- a/modules/lemonldap-ng-handler/example/autoProtectedCGI.pl
+++ b/modules/lemonldap-ng-handler/example/autoProtectedCGI.pl
@@ -8,7 +8,7 @@ my $cgi = new Lemonldap::NG::Handler::CGI ( {
},
configStorage => {
type => 'File',
- dirName => '__DIR__/conf',
+ dirName => '__CONFDIR__',
},
https => 0,
}
diff --git a/modules/lemonldap-ng-manager/example/index.pl b/modules/lemonldap-ng-manager/example/index.pl
index ee66a84d5..4ba2c77ff 100644
--- a/modules/lemonldap-ng-manager/example/index.pl
+++ b/modules/lemonldap-ng-manager/example/index.pl
@@ -6,7 +6,7 @@ my $h = new Lemonldap::NG::Manager(
{
configStorage => {
type => 'File',
- dirName => "__DIR__/conf/",
+ dirName => "__CONFDIR__",
},
dhtmlXTreeImageLocation => "/imgs/",
applyConfFile => '__DIR__/manager/apply.conf',
diff --git a/modules/lemonldap-ng-manager/example/soapserver.pl b/modules/lemonldap-ng-manager/example/soapserver.pl
index bf92ed99a..03199f038 100755
--- a/modules/lemonldap-ng-manager/example/soapserver.pl
+++ b/modules/lemonldap-ng-manager/example/soapserver.pl
@@ -5,7 +5,7 @@ use Lemonldap::NG::Manager::SOAPServer;
Lemonldap::NG::Manager::SOAPServer->start(
configStorage => {
type => "File",
- dirName => "/usr/share/doc/lemonldap-ng/examples/conf/"
+ dirName => "__CONFDIR__"
}
);
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
index 88039e506..7f08ef24c 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
@@ -1,6 +1,7 @@
package Lemonldap::NG::Manager::Conf;
use strict;
+no strict 'refs';
use Storable qw(thaw freeze);
use MIME::Base64;
use Lemonldap::NG::Manager::Conf::Constants;
@@ -28,7 +29,6 @@ sub new {
unless $self->{type} =~ /^Lemonldap/;
eval "require $self->{type}";
die($@) if ($@);
- unshift @ISA, $self->{type};
return 0 unless $self->prereq;
$self->{mdone}++;
}
@@ -79,6 +79,38 @@ sub getConf {
return $conf;
}
+sub prereq {
+ return &{$_[0]->{type}.'::prereq'}(@_);
+}
+
+sub available {
+ return &{$_[0]->{type}.'::available'}(@_);
+}
+
+sub lastCfg {
+ return &{$_[0]->{type}.'::lastCfg'}(@_);
+}
+
+sub lock {
+ return &{$_[0]->{type}.'::lock'}(@_);
+}
+
+sub isLocked {
+ return &{$_[0]->{type}.'::isLocked'}(@_);
+}
+
+sub unlock {
+ return &{$_[0]->{type}.'::unlock'}(@_);
+}
+
+sub store {
+ return &{$_[0]->{type}.'::store'}(@_);
+}
+
+sub load {
+ return &{$_[0]->{type}.'::load'}(@_);
+}
+
1;
__END__
diff --git a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm
index 6fcc2ff48..738150aec 100644
--- a/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm
+++ b/modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Help.pm
@@ -2,7 +2,7 @@ package Lemonldap::NG::Manager::Help;
use AutoLoader qw(AUTOLOAD);
use UNIVERSAL qw(can);
-our $VERSION = '0.31';
+our $VERSION = '0.32';
sub import {
my ($caller_package) = caller;
@@ -324,25 +324,41 @@ EOT
sub help_ldap_en {
print <LDAP Parameters
-This help chapter does not exist in english. If you want to help us, you can
-edit lib/Lemonldap/NG/Manager/Help.pm in lemonldap-ng source tree and send us
-your contribution.
-Thanks.
+LDAP parameters are used to identify users. They must be set even if
+authentication is done by another system (SSL for example).
+
+ - LDAP base : required (except if your server accepts the requests without
+ base). Example :
+
dc=example, dc=com
+ - LDAP server port : 389 by default ;
+ - LDAP server : Name (or IP address) of the LDAP server. To use LDAPS, set
+ here :
+
ldaps://server/
+ and don't forget to change port (636 for example)
+ - LDAP account : optional, must be set if anonymous connection cannot
+ access to the wanted LDAP attributes. This account is used before LDAP
+ authentication to find user's dn ;
+
+ - LDAP password : password corresponding to the account above.
+
EOT
}
sub help_ldap_fr {
print <Paramètres LDAP
- Le paramètres LDAP servent à identifier les utilisateurs. Ils doivent être
-renseignés même si l'authentification est réalisée par un autre moyen (SSL par
-exemple).
+ Les paramètres LDAP servent à identifier les utilisateurs.
+Ils doivent être renseignés même si l'authentification est
+réalisée par un autre moyen (SSL par exemple).
- Base de recherche LDAP : obligatoire (à moins que votre serveur LDAP
- accepte les requêtes sans base) ; exemple :
+ accepte les requêtes sans base). Exemple :
dc=example, dc=com
- Port du serveur LDAP : 389 par défaut ;
- - Serveur LDAP : Nom (ou adresse IP) du serveur LDAP ;
+ - Serveur LDAP : Nom (ou adresse IP) du serveur LDAP. Pour une connexion
+ LDAPS, indiquez ici :
+
ldaps://server/
+ et n'oubliez pas de changer le port (636 en général)
- Compte de connexion LDAP : optionnel, à renseigner si les attributs LDAP
utilisés ne sont pas accessibles par une session anonyme. Ce compte est
utilisé avant l'authentification pour trouver le dn de l'utilisateur ;
diff --git a/modules/lemonldap-ng-portal/example/index.pl b/modules/lemonldap-ng-portal/example/index.pl
index 242f9c7c4..1edcae757 100644
--- a/modules/lemonldap-ng-portal/example/index.pl
+++ b/modules/lemonldap-ng-portal/example/index.pl
@@ -6,7 +6,7 @@ my $portal = Lemonldap::NG::Portal::SharedConf->new(
{
configStorage => {
type => 'File',
- dirName => '__DIR__/conf/',
+ dirName => '__CONFDIR__',
}
}
);