Working on install (#595)

This commit is contained in:
Xavier Guimard 2017-02-24 12:28:55 +00:00
parent 046554d41b
commit 9ae8fd9f83
18 changed files with 9 additions and 332 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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/

View File

@ -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

View File

@ -1 +1 @@
debian/tmp/var/lib/lemonldap-ng/manager/psgi/manager-server.*
debian/tmp/usr/share/lemonldap-ng/manager/manager.*

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -1 +0,0 @@
debian/tmp/examples/portal/*

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

5
debian/rules vendored
View File

@ -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

View File

@ -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 { "<element name='$_' type='xsd:string'></element>" } @cookies;
my $attrList = join "\n",
map { "<element name='$_' type='xsd:string' nillable='true'></element>" }
$self->conf->{exportedAttr};
print <<EOT;
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions
targetNamespace="urn:Lemonldap/NG/Common/CGI/SOAPService"
xmlns:impl="urn:Lemonldap/NG/Common/CGI/SOAPService"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:tns1="urn:Lemonldap/NG/Common/CGI/SOAPService">
<!-- types definitions -->
<wsdl:types>
<schema targetNamespace="urn:Lemonldap/NG/Common/CGI/SOAPService" xmlns="http://www.w3.org/2001/XMLSchema">
<import namespace="http://schemas.xmlsoap.org/soap/encoding/" />
<complexType name="CookiesSequence">
<sequence>
$cookieList
</sequence>
</complexType>
<complexType name="AttributesSequence">
<sequence>
$attrList
</sequence>
</complexType>
<complexType name="GetCookieResponse">
<sequence>
<element name="errorCode" type="xsd:int"></element>
<element name="cookies" minOccurs="0" type="tns1:CookiesSequence"></element>
</sequence>
</complexType>
<complexType name="GetAttributesResponse">
<sequence>
<element name="error" type="xsd:int"></element>
<element name="attributes" type="tns1:AttributesSequence"></element>
</sequence>
</complexType>
</schema>
</wsdl:types>
<!-- authentication service -->
<wsdl:message name="errorRequest">
<wsdl:part name="code" type="xsd:int" />
<wsdl:part name="lang" type="xsd:string" />
</wsdl:message>
<wsdl:message name="errorResponse">
<wsdl:part name="result" type="xsd:string" />
</wsdl:message>
<wsdl:message name="getCookiesRequest">
<wsdl:part name="user" type="xsd:string" />
<wsdl:part name="password" type="xsd:string" />
</wsdl:message>
<wsdl:message name="getCookiesResponse">
<wsdl:part name="session" type="tns1:GetCookieResponse" />
</wsdl:message>
<wsdl:portType name="authenticationPortType">
<wsdl:operation name="error" parameterOrder="code lang">
<wsdl:input message="impl:errorRequest" name="errorRequest" />
<wsdl:output message="impl:errorResponse" name="errorResponse" />
</wsdl:operation>
<wsdl:operation name="getCookies" parameterOrder="user password">
<wsdl:input message="impl:getCookiesRequest" name="getCookiesRequest" />
<wsdl:output message="impl:getCookiesResponse" name="getCookiesResponse" />
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="authenticationBinding" type="impl:authenticationPortType">
<wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
<wsdl:operation name="error">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="errorRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="errorResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getCookies">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="getCookiesRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="getCookiesResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="authenticationService">
<wsdl:port binding="impl:authenticationBinding" name="authenticationPort">
<wsdlsoap:address location="$portal" />
</wsdl:port>
</wsdl:service>
<!-- notification service -->
<wsdl:message name="newNotificationRequest">
<wsdl:part name="notification" type="xsd:string" />
</wsdl:message>
<wsdl:message name="newNotificationResponse">
<wsdl:part name="result" type="xsd:int" />
</wsdl:message>
<wsdl:message name="deleteNotificationRequest">
<wsdl:part name="uid" type="xsd:string" />
<wsdl:part name="myref" type="xsd:string" />
</wsdl:message>
<wsdl:message name="deleteNotificationResponse">
<wsdl:part name="result" type="xsd:int" />
</wsdl:message>
<wsdl:portType name="notificationPortType">
<wsdl:operation name="newNotification" parameterOrder="notification">
<wsdl:input message="impl:newNotificationRequest" name="newNotificationRequest" />
<wsdl:output message="impl:newNotificationResponse" name="newNotificationResponse" />
</wsdl:operation>
<wsdl:operation name="deleteNotification" parameterOrder="uid myref">
<wsdl:input message="impl:deleteNotificationRequest" name="deleteNotificationRequest" />
<wsdl:output message="impl:deleteNotificationResponse" name="deleteNotificationResponse" />
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="notificationBinding" type="impl:notificationPortType">
<wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
<wsdl:operation name="newNotification">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="newNotificationRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="newNotificationResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="deleteNotification">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="deleteNotificationRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="deleteNotificationResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="notificationService">
<wsdl:port binding="impl:notificationBinding" name="notificationPort">
<wsdlsoap:address location="$portal/notification" />
</wsdl:port>
</wsdl:service>
<!-- sessions service -->
<wsdl:message name="getAttributesRequest">
<wsdl:part name="id" type="xsd:string" />
</wsdl:message>
<wsdl:message name="getAttributesResponse">
<wsdl:part name="session" type="tns1:GetAttributesResponse" />
</wsdl:message>
<wsdl:message name="isAuthorizedURIRequest">
<wsdl:part name="id" type="xsd:string" />
<wsdl:part name="uri" type="xsd:string" />
</wsdl:message>
<wsdl:message name="isAuthorizedURIResponse">
<wsdl:part name="result" type="xsd:int" />
</wsdl:message>
<wsdl:message name="getMenuApplicationsRequest">
<wsdl:part name="id" type="xsd:string" />
</wsdl:message>
<wsdl:message name="getMenuApplicationsResponse">
<wsdl:part name="result" type="xsd:anyType" />
</wsdl:message>
<wsdl:portType name="sessionsPortType">
<wsdl:operation name="getAttributes" parameterOrder="id">
<wsdl:input message="impl:getAttributesRequest" name="getAttributesRequest" />
<wsdl:output message="impl:getAttributesResponse" name="getAttributesResponse" />
</wsdl:operation>
<wsdl:operation name="isAuthorizedURI" parameterOrder="id uri">
<wsdl:input message="impl:isAuthorizedURIRequest" name="isAuthorizedURIRequest" />
<wsdl:output message="impl:isAuthorizedURIResponse" name="isAuthorizedURIResponse" />
</wsdl:operation>
<wsdl:operation name="getMenuApplications" parameterOrder="id">
<wsdl:input message="impl:getMenuApplicationsRequest" name="getMenuApplicationsRequest" />
<wsdl:output message="impl:getMenuApplicationsResponse" name="getMenuApplicationsResponse" />
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="sessionsBinding" type="impl:sessionsPortType">
<wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http" />
<wsdl:operation name="getAttributes">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="getAttributesRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="getAttributesResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="isAuthorizedURI">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="isAuthorizedURIRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="isAuthorizedURIResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
<wsdl:operation name="getMenuApplications">
<wsdlsoap:operation soapAction="" />
<wsdl:input name="getMenuApplicationsRequest">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:input>
<wsdl:output name="getMenuApplicationsResponse">
<wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:Lemonldap/NG/Common/CGI/SOAPService" use="encoded" />
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="sessionsService">
<wsdl:port binding="impl:sessionsBinding" name="sessionsPort">
<wsdlsoap:address location="$portal/sessions" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
EOT

View File

@ -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