Commit 9ae8fd9f authored by Xavier Guimard's avatar Xavier Guimard

Working on install (#595)

parent 046554d4
......@@ -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
......
/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
/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
......@@ -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/
......@@ -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
......
debian/tmp/var/lib/lemonldap-ng/manager/psgi/manager-server.*
debian/tmp/usr/share/lemonldap-ng/manager/manager.*
/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
/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
/var/lib/lemonldap-ng/captcha
/var/lib/lemonldap-ng/sessions/lock
/var/lib/lemonldap-ng/psessions/lock
/var/lib/lemonldap-ng/notifications
/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
/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
......@@ -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
#!/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
#!/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
......@@ -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
......
This diff is collapsed.
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment