diff --git a/Makefile b/Makefile
index 80213b775..8d88221ac 100644
--- a/Makefile
+++ b/Makefile
@@ -945,7 +945,7 @@ debian-packages: debian-dist
rm -rf lemonldap-ng-$$version && \
$(UNCOMPRESS) lemonldap-ng_$$version.orig.$(COMPRESSSUFFIX) && \
cd lemonldap-ng-$$version && \
- dpkg-buildpackage -us -uc
+ debuild -us -uc
# Developper corner
# -----------------
@@ -976,7 +976,6 @@ default-diff:
@# Portal
@$(DIFF) $(SRCPORTALDIR)/lib/Lemonldap/NG/Portal /usr/local/share/perl/$(PERLVERSION)/Lemonldap/NG/Portal ||true
@$(DIFF) $(SRCPORTALDIR)/example/scripts/purgeCentralCache $(LMPREFIX)/bin/purgeCentralCache ||true
- @$(DIFF) $(SRCPORTALDIR)/example/scripts/buildPortalWSDL $(LMPREFIX)/bin/buildPortalWSDL ||true
@$(DIFF) $(SRCPORTALDIR)/example/skins $(LMPREFIX)/htdocs/portal/skins ||true
@$(DIFF) $(SRCPORTALDIR)/example/index_skin.pl $(LMPREFIX)/htdocs/portal/index.pl ||true
@$(DIFF) $(SRCPORTALDIR)/example/mail.pl $(LMPREFIX)/htdocs/portal/mail.pl ||true
diff --git a/debian/lemonldap-ng-doc.links b/debian/lemonldap-ng-doc.links
deleted file mode 100644
index afa34041c..000000000
--- a/debian/lemonldap-ng-doc.links
+++ /dev/null
@@ -1,12 +0,0 @@
-/usr/share/doc/lemonldap-ng-doc/lib/images/smileys/icon_frown.gif /usr/share/doc/lemonldap-ng-doc/lib/images/smileys/icon_sad.gif
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/sxc.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/ods.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/sxc.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/odc.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/png.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/jpg.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/png.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/jpeg.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/png.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/gif.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/tgz.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/gz.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/odg.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/odi.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/odg.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/sxd.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/odt.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/sxw.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/odp.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/sxi.png
-/usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/html.png /usr/share/doc/lemonldap-ng-doc/lib/images/fileicons/htm.png
diff --git a/debian/lemonldap-ng-fr-doc.links b/debian/lemonldap-ng-fr-doc.links
deleted file mode 100644
index b664cb0cb..000000000
--- a/debian/lemonldap-ng-fr-doc.links
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/doc/lemonldap-ng-doc/lib /usr/share/doc/lemonldap-ng-fr-doc/lib
-/usr/share/doc/lemonldap-ng-doc/media /usr/share/doc/lemonldap-ng-fr-doc/media
-/usr/share/doc/lemonldap-ng-fr-doc/css/all.css /usr/share/doc/lemonldap-ng-fr-doc/css/print.css
diff --git a/debian/liblemonldap-ng-common-perl.install b/debian/liblemonldap-ng-common-perl.install
index 41181a7a1..aa2ec9993 100644
--- a/debian/liblemonldap-ng-common-perl.install
+++ b/debian/liblemonldap-ng-common-perl.install
@@ -7,6 +7,7 @@
/usr/share/perl5/Lemonldap/NG/Common*
/usr/share/lemonldap-ng/ressources
/usr/share/lemonldap-ng/bin/convertConfig
+/usr/share/lemonldap-ng/bin/lemonldap-ng-cli
/usr/share/lemonldap-ng/bin/lmMigrateConfFiles2ini
/usr/share/lemonldap-ng/bin/rotateOidcKeys
/var/lib/lemonldap-ng/conf/
diff --git a/debian/liblemonldap-ng-common-perl.postinst b/debian/liblemonldap-ng-common-perl.postinst
index 6c3485a64..7ec548fe1 100755
--- a/debian/liblemonldap-ng-common-perl.postinst
+++ b/debian/liblemonldap-ng-common-perl.postinst
@@ -7,7 +7,7 @@ set -e
CONFDIR=/etc/lemonldap-ng
SESSIONSDIR=/var/lib/lemonldap-ng/sessions
CONFSTORAGEDIR=/var/lib/lemonldap-ng/conf
-FIRSTCONFFILE=$CONFSTORAGEDIR/lmConf-1.js
+FIRSTCONFFILE=$CONFSTORAGEDIR/lmConf-1.json
LMINIFILE=/etc/lemonldap-ng/lemonldap-ng.ini
MIGRATION=/usr/share/lemonldap-ng/bin/lmMigrateConfFiles2ini
diff --git a/debian/liblemonldap-ng-manager-perl.examples b/debian/liblemonldap-ng-manager-perl.examples
index 9e3953c2a..510df775f 100644
--- a/debian/liblemonldap-ng-manager-perl.examples
+++ b/debian/liblemonldap-ng-manager-perl.examples
@@ -1 +1 @@
-debian/tmp/var/lib/lemonldap-ng/manager/psgi/manager-server.*
+debian/tmp/usr/share/lemonldap-ng/manager/manager.*
diff --git a/debian/liblemonldap-ng-manager-perl.install b/debian/liblemonldap-ng-manager-perl.install
index d25c37a3b..d9fd02373 100644
--- a/debian/liblemonldap-ng-manager-perl.install
+++ b/debian/liblemonldap-ng-manager-perl.install
@@ -1,8 +1,5 @@
/etc/lemonldap-ng/manager-apache2.conf
/etc/lemonldap-ng/manager-nginx.conf
/usr/share/perl5/Lemonldap/NG/Manager*
-/usr/share/lemonldap-ng/manager/static
-/usr/share/lemonldap-ng/manager/templates
-/usr/share/lemonldap-ng/manager/psgi/manager-server.fcgi
+/usr/share/lemonldap-ng/manager
/usr/share/lemonldap-ng/bin/lmConfigEditor
-/usr/share/lemonldap-ng/bin/lemonldap-ng-cli
diff --git a/debian/liblemonldap-ng-manager-perl.links b/debian/liblemonldap-ng-manager-perl.links
index 440df8fe0..3c59f604a 100644
--- a/debian/liblemonldap-ng-manager-perl.links
+++ b/debian/liblemonldap-ng-manager-perl.links
@@ -1,3 +1,4 @@
/etc/lemonldap-ng/manager-apache2.conf /etc/apache2/sites-available/manager-apache2.conf
/etc/lemonldap-ng/manager-nginx.conf /etc/nginx/sites-available/manager-nginx.conf
/usr/share/lemonldap-ng/manager/static /var/lib/lemonldap-ng/manager/static
+/usr/share/lemonldap-ng/manager/manager.fcgi /var/lib/lemonldap-ng/manager/manager.fcgi
diff --git a/debian/liblemonldap-ng-portal-perl.dirs b/debian/liblemonldap-ng-portal-perl.dirs
index a7a9f4ff9..5e5300112 100644
--- a/debian/liblemonldap-ng-portal-perl.dirs
+++ b/debian/liblemonldap-ng-portal-perl.dirs
@@ -1,4 +1,2 @@
/var/lib/lemonldap-ng/captcha
-/var/lib/lemonldap-ng/sessions/lock
-/var/lib/lemonldap-ng/psessions/lock
/var/lib/lemonldap-ng/notifications
diff --git a/debian/liblemonldap-ng-portal-perl.examples b/debian/liblemonldap-ng-portal-perl.examples
deleted file mode 100644
index 70553dff5..000000000
--- a/debian/liblemonldap-ng-portal-perl.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/examples/portal/*
diff --git a/debian/liblemonldap-ng-portal-perl.install b/debian/liblemonldap-ng-portal-perl.install
index 9518da107..ce744dd11 100644
--- a/debian/liblemonldap-ng-portal-perl.install
+++ b/debian/liblemonldap-ng-portal-perl.install
@@ -1,10 +1,6 @@
/usr/share/lemonldap-ng/bin/purgeCentralCache
-/usr/share/lemonldap-ng/portal-skins
/usr/share/man/man3/Lemonldap::NG::Portal*
-/usr/share/perl5/auto/Lemonldap/NG/Portal
/usr/share/perl5/Lemonldap/NG/Portal*
-/usr/share/lemonldap-ng/bin/buildPortalWSDL
/usr/share/lemonldap-ng/portal
-/var/lib/lemonldap-ng/portal
/etc/lemonldap-ng/portal-apache2.conf
/etc/lemonldap-ng/portal-nginx.conf
diff --git a/debian/liblemonldap-ng-portal-perl.links b/debian/liblemonldap-ng-portal-perl.links
index 44af625f7..08492d6b4 100644
--- a/debian/liblemonldap-ng-portal-perl.links
+++ b/debian/liblemonldap-ng-portal-perl.links
@@ -1,3 +1,4 @@
/etc/lemonldap-ng/portal-apache2.conf /etc/apache2/sites-available/portal-apache2.conf
/etc/lemonldap-ng/portal-nginx.conf /etc/nginx/sites-available/portal-nginx.conf
+/usr/share/lemonldap-ng/portal/static /var/lib/lemonldap-ng/portal/static
/usr/share/lemonldap-ng/portal/index.fcgi /var/lib/lemonldap-ng/portal/index.fcgi
diff --git a/debian/liblemonldap-ng-portal-perl.lintian-overrides b/debian/liblemonldap-ng-portal-perl.lintian-overrides
index a3afcb28d..db530e4d5 100644
--- a/debian/liblemonldap-ng-portal-perl.lintian-overrides
+++ b/debian/liblemonldap-ng-portal-perl.lintian-overrides
@@ -2,7 +2,3 @@
# directory, so it must not be readable by all but must be writable by www-data
liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/captcha/ 0770 != 0755
liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/notifications/ 0770 != 0755
-liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/lock/ 0770 != 0755
-liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/sessions/ 0770 != 0755
-liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/psessions/lock/ 0770 != 0755
-liblemonldap-ng-portal-perl: non-standard-dir-perm var/lib/lemonldap-ng/psessions/ 0770 != 0755
diff --git a/debian/liblemonldap-ng-portal-perl.postinst b/debian/liblemonldap-ng-portal-perl.postinst
deleted file mode 100644
index 2ecddea1d..000000000
--- a/debian/liblemonldap-ng-portal-perl.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-BUILDPORTALWSDL=/usr/share/lemonldap-ng/bin/buildPortalWSDL
-WSDLFILE=/var/lib/lemonldap-ng/portal/portal.wsdl
-
-if [ "$1" == "configure" ]
-then
- $BUILDPORTALWSDL > $WSDLFILE || true
-fi
-
-#DEBHELPER#
-exit 0
diff --git a/debian/liblemonldap-ng-portal-perl.postrm b/debian/liblemonldap-ng-portal-perl.postrm
deleted file mode 100644
index 72827d662..000000000
--- a/debian/liblemonldap-ng-portal-perl.postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-if [ "$1" == "configure" ]
-then
- db_purge
-fi
-
-if [ "$1" == "purge" ]
-then
- rm -f /var/lib/lemonldap-ng/portal/portal.wsdl
-fi
-
-#DEBHELPER#
-exit 0
diff --git a/debian/rules b/debian/rules
index f298548a3..757a8ac9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ SESSIONSDIR=$(LMVARDIR)/sessions
PSESSIONSDIR=$(LMVARDIR)/psessions
NOTIFICATIONSDIR=$(LMVARDIR)/notifications
CONFSTORAGEDIR=$(LMVARDIR)/conf
-FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1.js
+FIRSTCONFFILE=$(CONFSTORAGEDIR)/lmConf-1.json
LMINIFILE=$(CONFDIR)/lemonldap-ng.ini
CAPTCHADIR=$(LMVARDIR)/captcha
@@ -37,8 +37,8 @@ override_dh_auto_install:
DOCUMENTROOT=$(LMVARDIR) \
EXAMPLESDIR=/examples \
HANDLERDIR=$(LMVARDIR)/handler \
- PORTALSKINSDIR=$(LMSHAREDIR)/portal-skins \
MANAGERDIR=$(LMSHAREDIR)/manager \
+ PORTALDIR=$(LMSHAREDIR)/portal \
STORAGECONFFILE=/etc/lemonldap-ng/lemonldap-ng.ini \
TOOLSDIR=$(LMSHAREDIR)/ressources \
CONFDIR=/etc/lemonldap-ng \
@@ -53,7 +53,6 @@ override_dh_auto_install:
DESTDIR=$(CURDIR)/debian/tmp \
DOCDIR=/usr/share/doc/lemonldap-ng-fr-doc \
USEDEBIANLIBS=yes
- mkdir $(TMP)/$(LMSHAREDIR)/portal
for i in handler portal manager test; do \
mv $(TMP)/etc/lemonldap-ng/$$i-apache2.X.conf $(TMP)/etc/lemonldap-ng/$$i-apache2.conf; \
done
diff --git a/lemonldap-ng-portal/scripts/buildPortalWSDL b/lemonldap-ng-portal/scripts/buildPortalWSDL
deleted file mode 100644
index b8fe28b88..000000000
--- a/lemonldap-ng-portal/scripts/buildPortalWSDL
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/usr/bin/perl
-
-use Lemonldap::NG::Portal::Main;
-
-my $self = Lemonldap::NG::Portal::Main->new( {} );
-
-unless ( $self->conf->{soapConfigServer} or $self->conf->{soapSessionServer} ) {
- print STDERR "Lemonldap::NG Portal SOAP capability is disabled.\n";
- exit;
-}
-
-my $portal = $self->conf->{portal};
-$portal .= "index.fcgi" if ( $portal =~ /\/$/ );
-
-my @cookies = ( $self->conf->{cookieName} );
-push @cookies, "$self->conf->{cookieName}http"
- if ( $self->conf->{securedCookie} >= 2 );
-my $cookieList = join "\n",
- map { "" } @cookies;
-
-my $attrList = join "\n",
- map { "" }
- $self->conf->{exportedAttr};
-
-print <
-
-
-
-
-
-
-
-
-
-
-
-$cookieList
-
-
-
-
-$attrList
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-EOT
-
diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec
index c32ecd3a2..a168b6b6d 100644
--- a/rpm/lemonldap-ng.spec
+++ b/rpm/lemonldap-ng.spec
@@ -565,7 +565,6 @@ rm -rf %{buildroot}
%files -n lemonldap-ng-portal
%defattr(-,root,root,-)
%{lm_vardir}/portal
-%{lm_sharedir}/bin/buildPortalWSDL
%{lm_sharedir}/bin/purgeCentralCache
%{_sysconfdir}/cron.d/lemonldap-ng-portal
%{lm_examplesdir}/portal