Harmonize manager to portal (dir htdocs)
This commit is contained in:
Xavier Guimard
parent
43fbe42b7e
commit
d3766ff37a
55
Makefile
55
Makefile
|
|
@ -50,8 +50,8 @@ DATADIR=$(LMPREFIX)/data
|
|||
# Document roots for Apache VirtualHosts
|
||||
DOCUMENTROOT=$(LMPREFIX)/htdocs
|
||||
PORTALDIR=$(DOCUMENTROOT)/portal
|
||||
PORTALSITEDIR=$(MANAGERDIR)
|
||||
PORTALSTATICDIR=$(MANAGERSITEDIR)/static
|
||||
PORTALSITEDIR=$(PORTALDIR)
|
||||
PORTALSTATICDIR=$(PORTALSITEDIR)/static
|
||||
PORTALRELATIVESTATICDIR=/static
|
||||
PORTALTEMPLATESDIR=$(MANAGERSITEDIR)/templates
|
||||
|
||||
|
|
@ -59,7 +59,6 @@ MANAGERDIR=$(DOCUMENTROOT)/manager
|
|||
MANAGERSITEDIR=$(MANAGERDIR)
|
||||
MANAGERSTATICDIR=$(MANAGERSITEDIR)/static
|
||||
MANAGERRELATIVESTATICDIR=/static
|
||||
MANAGERPSGIDIR=$(MANAGERSITEDIR)/psgi
|
||||
MANAGERTEMPLATESDIR=$(MANAGERSITEDIR)/templates
|
||||
DOCDIR=$(DOCUMENTROOT)
|
||||
DEFDOCDIR=$(DOCUMENTROOT)/doc
|
||||
|
|
@ -132,14 +131,12 @@ RINITDIR=$(DESTDIR)/$(INITDIR)
|
|||
RETCDEFAULTDIR=$(DESTDIR)/$(ETCDEFAULTDIR)
|
||||
RDATADIR=$(DESTDIR)/$(DATADIR)
|
||||
RPORTALDIR=$(DESTDIR)/$(PORTALDIR)
|
||||
RPORTALSITEDIR=$(DESTDIR)/$(MANAGERSITEDIR)
|
||||
RPORTALSTATICDIR=$(DESTDIR)/$(MANAGERSTATICDIR)
|
||||
RPORTALPSGIDIR=$(DESTDIR)/$(MANAGERPSGIDIR)
|
||||
RPORTALTEMPLATESDIR=$(DESTDIR)/$(MANAGERTEMPLATESDIR)
|
||||
RPORTALSITEDIR=$(DESTDIR)/$(PORTALSITEDIR)
|
||||
RPORTALSTATICDIR=$(DESTDIR)/$(PORTALSTATICDIR)
|
||||
RPORTALTEMPLATESDIR=$(DESTDIR)/$(PORTALTEMPLATESDIR)
|
||||
RMANAGERDIR=$(DESTDIR)/$(MANAGERDIR)
|
||||
RMANAGERSITEDIR=$(DESTDIR)/$(MANAGERSITEDIR)
|
||||
RMANAGERSTATICDIR=$(DESTDIR)/$(MANAGERSTATICDIR)
|
||||
RMANAGERPSGIDIR=$(DESTDIR)/$(MANAGERPSGIDIR)
|
||||
RMANAGERTEMPLATESDIR=$(DESTDIR)/$(MANAGERTEMPLATESDIR)
|
||||
RDOCDIR=$(DESTDIR)/$(DOCDIR)
|
||||
RDEFDOCDIR=$(DESTDIR)/$(DEFDOCDIR)
|
||||
|
|
@ -187,8 +184,8 @@ MANAGERJSONSRC= scripts/jsongenerator.pl \
|
|||
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Build/Attributes.pm \
|
||||
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Build/Tree.pm \
|
||||
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Conf/Zero.pm
|
||||
MANAGERJSONDST=$(SRCMANAGERDIR)/site/static/struct.json \
|
||||
$(SRCMANAGERDIR)/site/static/js/conftree.js \
|
||||
MANAGERJSONDST=$(SRCMANAGERDIR)/site/htdocs/static/struct.json \
|
||||
$(SRCMANAGERDIR)/site/htdocs/static/js/conftree.js \
|
||||
$(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager/Attributes.pm \
|
||||
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/ReConstants.pm \
|
||||
$(SRCCOMMONDIR)/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm \
|
||||
|
|
@ -196,15 +193,15 @@ MANAGERJSONDST=$(SRCMANAGERDIR)/site/static/struct.json \
|
|||
_example/conf/lmConf-1.json
|
||||
|
||||
# Javascript and CSS to minify
|
||||
JSSRCFILES:=$(shell find */site/static/js $(SRCPORTALDIR)/site/htdocs/static -type f -name '*.js' ! -name '*.min.js') \
|
||||
$(SRCMANAGERDIR)/site/static/bwr/file-saver.js/FileSaver.js
|
||||
CSSSRCFILES:=$(shell find */site/static/css $(SRCPORTALDIR)/site/htdocs/static -type f -name '*.css' ! -name '*.min.css')
|
||||
JSSRCFILES:=$(shell find */site/htdocs/static/js $(SRCPORTALDIR)/site/htdocs/static -type f -name '*.js' ! -name '*.min.js') \
|
||||
$(SRCMANAGERDIR)/site/htdocs/static/bwr/file-saver.js/FileSaver.js
|
||||
CSSSRCFILES:=$(shell find */site/htdocs/static/css $(SRCPORTALDIR)/site/htdocs/static -type f -name '*.css' ! -name '*.min.css')
|
||||
|
||||
# Coffee files
|
||||
MANAGERCOFFEESRCFILES:=$(shell find lemonldap-ng-manager/site/coffee -type f -name '*.coffee')
|
||||
PORTALCOFFEESRCFILES:=$(shell find lemonldap-ng-portal/site/coffee -type f -name '*.coffee')
|
||||
COFFEESRCFILES=$(MANAGERCOFFEESRCFILES) $(PORTALCOFFEESRCFILES)
|
||||
MANAGERCOFFEEDSTFILES:=$(subst coffee/,static/js/,$(MANAGERCOFFEESRCFILES:.coffee=.js))
|
||||
MANAGERCOFFEEDSTFILES:=$(subst coffee/,htdocs/static/js/,$(MANAGERCOFFEESRCFILES:.coffee=.js))
|
||||
PORTALCOFFEEDSTFILES:=$(subst coffee/,htdocs/static/common/js/,$(PORTALCOFFEESRCFILES:.coffee=.js))
|
||||
COFFEEDSTFILES:=$(MANAGERCOFFEEDSTFILES) $(PORTALCOFFEEDSTFILES)
|
||||
|
||||
|
|
@ -282,10 +279,10 @@ $(SRCPORTALDIR)/site/htdocs/static/common/js/%.js: $(SRCPORTALDIR)/site/coffee/%
|
|||
coffee -c -o $(SRCPORTALDIR)/site/htdocs/static/common/js/ $(SRCPORTALDIR)/site/coffee/$*.coffee; \
|
||||
fi
|
||||
|
||||
$(SRCMANAGERDIR)/site/static/js/%.js: $(SRCMANAGERDIR)/site/coffee/%.coffee
|
||||
$(SRCMANAGERDIR)/site/htdocs/static/htdocs/js/%.js: $(SRCMANAGERDIR)/site/coffee/%.coffee
|
||||
@if which coffee >/dev/null; then \
|
||||
echo "Compiling $(SRCMANAGERDIR)/site/coffee/$*.coffee"; \
|
||||
coffee -c -o $(SRCMANAGERDIR)/site/static/js/ $(SRCMANAGERDIR)/site/coffee/$*.coffee; \
|
||||
coffee -c -o $(SRCMANAGERDIR)/site/htdocs/static/js/ $(SRCMANAGERDIR)/site/coffee/$*.coffee; \
|
||||
fi
|
||||
|
||||
%.min.css: %.css
|
||||
|
|
@ -364,8 +361,11 @@ manager_test: manager
|
|||
|
||||
e2e_test: all prepare_test_server start_web_server launch_protractor stop_web_server
|
||||
|
||||
|
||||
|
||||
prepare_test_server:
|
||||
@mkdir -p e2e-tests/conf/sessions/lock e2e-tests/conf/persistents/lock
|
||||
@mkdir e2e-tests/conf/manager e2e-tests/conf/portal
|
||||
$(MAKE) install_webserver_conf install_test_site install_fastcgi_server \
|
||||
CONFDIR=`pwd`/e2e-tests/conf \
|
||||
RCONFDIR=e2e-tests/conf \
|
||||
|
|
@ -373,17 +373,22 @@ prepare_test_server:
|
|||
VHOSTLISTEN='*:$(TESTWEBSERVERPORT)' \
|
||||
PORT=$(TESTWEBSERVERPORT) \
|
||||
FASTCGISOCKDIR=`pwd`/e2e-tests/conf \
|
||||
PORTALDIR=`pwd`/e2e-tests/conf \
|
||||
PORTALDIR=`pwd`/e2e-tests/conf/portal \
|
||||
PORTALSTATICDIR=`pwd`/$(SRCPORTALDIR)/site/htdocs/static \
|
||||
MANAGERDIR=`pwd`/$(SRCMANAGERDIR)/site \
|
||||
MANAGERDIR=`pwd`/e2e-tests/conf/manager \
|
||||
MANAGERSTATICDIR=`pwd`/$(SRCMANAGERDIR)/site/htdocs/static \
|
||||
TESTDIR=`pwd`/e2e-tests/conf/site \
|
||||
MANAGERPSGIDIR=`pwd`/e2e-tests \
|
||||
DEFDOCDIR=`pwd`/doc \
|
||||
FRDOCDIR=`pwd`/po-doc/fr \
|
||||
SBINDIR=`pwd`/e2e-tests/conf/sbin \
|
||||
INITDIR=`pwd`/e2e-tests/conf/init \
|
||||
ETCDEFAULTDIR=`pwd`/e2e-tests/conf/def
|
||||
@cp -f e2e-tests/index.* e2e-tests/conf/
|
||||
#@cp -f e2e-tests/index.* e2e-tests/conf/
|
||||
@cp -f $(SRCMANAGERDIR)/site/htdocs/manager* e2e-tests/conf/manager
|
||||
@cp -f $(SRCPORTALDIR)/site/htdocs/index* e2e-tests/conf/portal
|
||||
@for f in $$(find e2e-tests/conf -name '*.fcgi'); do \
|
||||
perl -i -pe 'if($$.==2){print "BEGIN{\n"; print qq(use lib q('`pwd`'/lemonldap-ng-$$_/blib/lib);\n) foreach qw(common handler portal manager); print "}\n"; }' $$f; \
|
||||
done
|
||||
@cp e2e-tests/lmConf-1.json e2e-tests/lemonldap-ng.ini e2e-tests/env.conf e2e-tests/test-nginx.conf e2e-tests/conf/
|
||||
@cp e2e-tests/form.html e2e-tests/conf/site
|
||||
@perl -i -pe 'BEGIN{$$p=`pwd`;chomp $$p}s#__pwd__#$$p#;s#__port__#$(TESTWEBSERVERPORT)#;s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#;' \
|
||||
|
|
@ -593,7 +598,6 @@ install_webserver_conf:
|
|||
s#__PORTALSTATICDIR__#$(PORTALSTATICDIR)/#g; \
|
||||
s#__MANAGERDIR__#$(MANAGERDIR)/#g; \
|
||||
s#__MANAGERSTATICDIR__#$(MANAGERSTATICDIR)/#g; \
|
||||
s#__MANAGERPSGIDIR__#$(MANAGERPSGIDIR)/#g; \
|
||||
s#__TESTDIR__#$(TESTDIR)/#g; \
|
||||
s#__PORT__#$(PORT)#g; \
|
||||
s#__CONFDIR__#$(CONFDIR)#g; \
|
||||
|
|
@ -604,9 +608,9 @@ install_webserver_conf:
|
|||
|
||||
install_manager_site: install_conf_dir
|
||||
# Manager install
|
||||
@install -v -d $(RMANAGERDIR) $(RMANAGERSTATICDIR) $(RMANAGERPSGIDIR) \
|
||||
@install -v -d $(RMANAGERDIR) $(RMANAGERSTATICDIR) \
|
||||
$(RMANAGERTEMPLATESDIR)
|
||||
@cp -pR $(SRCMANAGERDIR)/site/static/* $(RMANAGERSTATICDIR)
|
||||
@cp -pR $(SRCMANAGERDIR)/site/htdocs/static/* $(RMANAGERSTATICDIR)
|
||||
@for f in $(SRCMANAGERDIR)/site/templates/*.tpl; do \
|
||||
./scripts/transform-templates \
|
||||
usedebianlibs $(USEDEBIANLIBS) \
|
||||
|
|
@ -620,9 +624,8 @@ install_manager_site: install_conf_dir
|
|||
elif test "$(USEDEBIANLIBS)" = "yes"; then \
|
||||
rm -rvf $(MANAGERLIBSTOREMOVEFORDEBIAN); \
|
||||
fi
|
||||
@cp -pR $(SRCMANAGERDIR)/eg/* $(RMANAGERPSGIDIR)
|
||||
# Clean svn files
|
||||
@rm -rf $$(find ${RMANAGERSTATICDIR} $(RMANAGERPSGIDIR) \
|
||||
@rm -rf $$(find ${RMANAGERSTATICDIR} \
|
||||
$(RMANAGERTEMPLATESDIR) $(RCONFDIR) -type d -name .svn)
|
||||
@$(PERL) -i -pe 's#__MANAGERSTATICDIR__#$(MANAGERRELATIVESTATICDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
|
||||
@$(PERL) -i -pe 's#__MANAGERTEMPLATESDIR__#$(MANAGERTEMPLATESDIR)#g' $(RCONFDIR)/$(CONFFILENAME)
|
||||
|
|
@ -985,7 +988,7 @@ default-diff:
|
|||
@# Manager
|
||||
@$(DIFF) $(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager /usr/local/share/perl/$(PERLVERSION)/Lemonldap/NG/Manager ||true
|
||||
@$(DIFF) $(SRCMANAGERDIR)/lib/Lemonldap/NG/Manager.pm /usr/local/share/perl/$(PERLVERSION)/Lemonldap/NG/Manager.pm ||true
|
||||
@$(DIFF) $(SRCMANAGERDIR)/site/static $(LMPREFIX)/htdocs/manager/static ||true
|
||||
@$(DIFF) $(SRCMANAGERDIR)/site/htdocs/static $(LMPREFIX)/htdocs/manager/static ||true
|
||||
@$(DIFF) $(SRCMANAGERDIR)/site/templates $(LMPREFIX)/htdocs/manager/templates ||true
|
||||
@$(DIFF) --ignore-matching-lines='set.*get.*\[2\]' $(SRCMANAGERDIR)/scripts/lmConfigEditor $(LMPREFIX)/bin/lmConfigEditor ||true
|
||||
@$(DIFF) --ignore-matching-lines='set.*get.*' $(SRCCOMMONDIR)/scripts/lemonldap-ng-cli $(LMPREFIX)/bin/lemonldap-ng-cli ||true
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
# 1) URI management
|
||||
RewriteEngine on
|
||||
|
||||
RewriteRule "^/$" "/psgi/manager-server.fcgi" [PT]
|
||||
# For performances, you can delete the previous RewriteRule line after
|
||||
# puttings html files: simply put the HTML results of differents modules
|
||||
# (configuration, sessions, notifications) as manager.html, sessions.html,
|
||||
|
|
@ -28,16 +27,14 @@
|
|||
|
||||
# REST URLs
|
||||
RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib|javascript|favicon).*"
|
||||
RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
|
||||
|
||||
Alias /psgi/ __MANAGERPSGIDIR__/
|
||||
RewriteRule "^/(.+)$" "/manager.fcgi/$1" [PT]
|
||||
|
||||
# 2) FastCGI engine
|
||||
|
||||
# You can choose any FastCGI system. Here is an example using mod_fcgid
|
||||
# mod_fcgid configuration
|
||||
FcgidMaxRequestLen 2000000
|
||||
<Directory __MANAGERPSGIDIR__>
|
||||
<Files *.fcgi>
|
||||
SetHandler fcgid-script
|
||||
Options +ExecCGI
|
||||
<IfModule mod_headers.c>
|
||||
|
|
@ -46,13 +43,10 @@
|
|||
header set X-Frame-Options DENY
|
||||
header set X-XSS-Protection "1; mode=block"
|
||||
</IfModule>
|
||||
</Directory>
|
||||
</Files>
|
||||
|
||||
# If you want to use mod_fastcgi, replace lines below by:
|
||||
#FastCgiServer __MANAGERPSGIDIR__manager-server.fcgi
|
||||
|
||||
# Or if you prefer to use CGI, use /psgi/manager-server.cgi instead of
|
||||
# /psgi/manager-server.fcgi and adapt the rewrite rules.
|
||||
#FastCgiServer __MANAGERDIR__/manager.fcgi
|
||||
|
||||
# GLOBAL CONFIGURATION
|
||||
# --------------------
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
# 1) URI management
|
||||
RewriteEngine on
|
||||
|
||||
RewriteRule "^/$" "/psgi/manager-server.fcgi" [PT]
|
||||
# For performances, you can delete the previous RewriteRule line after
|
||||
# puttings html files: simply put the HTML results of differents modules
|
||||
# (configuration, sessions, notifications) as manager.html, sessions.html,
|
||||
|
|
@ -28,16 +27,14 @@
|
|||
|
||||
# REST URLs
|
||||
RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib|javascript|favicon).*"
|
||||
RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
|
||||
|
||||
Alias /psgi/ __MANAGERPSGIDIR__/
|
||||
RewriteRule "^/(.+)$" "/manager.fcgi/$1" [PT]
|
||||
|
||||
# 2) FastCGI engine
|
||||
|
||||
# You can choose any FastCGI system. Here is an example using mod_fcgid
|
||||
# mod_fcgid configuration
|
||||
FcgidMaxRequestLen 2000000
|
||||
<Directory __MANAGERPSGIDIR__>
|
||||
<Files *.fcgi>
|
||||
SetHandler fcgid-script
|
||||
Options +ExecCGI
|
||||
<IfModule mod_headers.c>
|
||||
|
|
@ -46,13 +43,10 @@
|
|||
header set X-Frame-Options DENY
|
||||
header set X-XSS-Protection "1; mode=block"
|
||||
</IfModule>
|
||||
</Directory>
|
||||
</Files>
|
||||
|
||||
# If you want to use mod_fastcgi, replace lines below by:
|
||||
#FastCgiServer __MANAGERPSGIDIR__manager-server.fcgi
|
||||
|
||||
# Or if you prefer to use CGI, use /psgi/manager-server.cgi instead of
|
||||
# /psgi/manager-server.fcgi and adapt the rewrite rules.
|
||||
#FastCgiServer __MANAGERDIR__/manager.fcgi
|
||||
|
||||
# GLOBAL CONFIGURATION
|
||||
# --------------------
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
# 1) URI management
|
||||
RewriteEngine on
|
||||
|
||||
RewriteRule "^/$" "/psgi/manager-server.fcgi" [PT]
|
||||
# For performances, you can delete the previous RewriteRule line after
|
||||
# puttings html files: simply put the HTML results of differents modules
|
||||
# (configuration, sessions, notifications) as manager.html, sessions.html,
|
||||
|
|
@ -28,16 +27,14 @@
|
|||
|
||||
# REST URLs
|
||||
RewriteCond "%{REQUEST_FILENAME}" "!^/(?:static|doc|fr-doc|lib|javascript|favicon).*"
|
||||
RewriteRule "^/(.+)$" "/psgi/manager-server.fcgi/$1" [PT]
|
||||
|
||||
Alias /psgi/ __MANAGERPSGIDIR__/
|
||||
RewriteRule "^/(.+)$" "/manager.fcgi/$1" [PT]
|
||||
|
||||
# 2) FastCGI engine
|
||||
|
||||
# You can choose any FastCGI system. Here is an example using mod_fcgid
|
||||
# mod_fcgid configuration
|
||||
FcgidMaxRequestLen 2000000
|
||||
<Directory __MANAGERPSGIDIR__>
|
||||
<Files *.fcgi>
|
||||
SetHandler fcgid-script
|
||||
Options +ExecCGI
|
||||
<IfModule mod_headers.c>
|
||||
|
|
@ -46,13 +43,10 @@
|
|||
header set X-Frame-Options DENY
|
||||
header set X-XSS-Protection "1; mode=block"
|
||||
</IfModule>
|
||||
</Directory>
|
||||
</Files>
|
||||
|
||||
# If you want to use mod_fastcgi, replace lines below by:
|
||||
#FastCgiServer __MANAGERPSGIDIR__manager-server.fcgi
|
||||
|
||||
# Or if you prefer to use CGI, use /psgi/manager-server.cgi instead of
|
||||
# /psgi/manager-server.fcgi and adapt the rewrite rules.
|
||||
#FastCgiServer __MANAGERDIR__/manager.fcgi
|
||||
|
||||
# GLOBAL CONFIGURATION
|
||||
# --------------------
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ server {
|
|||
server_name manager.__DNSDOMAIN__;
|
||||
root __MANAGERDIR__;
|
||||
|
||||
if ($uri !~ ^/(manager\.psgi|static|doc|fr-doc|lib|javascript|favicon)) {
|
||||
if ($uri !~ ^/(.*\.psgi|static|doc|fr-doc|lib|javascript|favicon)) {
|
||||
rewrite ^/(.*)$ /manager.psgi/$1 break;
|
||||
}
|
||||
|
||||
location /manager.psgi {
|
||||
location ~ \.psgi(?:$|/) {
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
fastcgi_param LLTYPE manager;
|
||||
fastcgi_param LLTYPE psgi;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_split_path_info ^(.*\.psgi)(/.*)$;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
|
|
@ -25,6 +25,8 @@ server {
|
|||
location / {
|
||||
index manager.psgi;
|
||||
try_files $uri $uri/ =404;
|
||||
allow 127.0.0.0/8;
|
||||
deny all;
|
||||
}
|
||||
|
||||
location /doc/ {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ describe('Lemonldap::NG', function() {
|
|||
browser.driver.get('http://test1.example.com:' + process.env.TESTWEBSERVERPORT + '/index.pl?logout_all');
|
||||
});
|
||||
it('should redirect after logout', function() {
|
||||
expect(browser.getCurrentUrl()).toMatch(new RegExp('^http://lemonldap-ng\.org/welcome'));
|
||||
expect(browser.getCurrentUrl()).toMatch(new RegExp('^https://lemonldap-ng\.org/welcome'));
|
||||
});
|
||||
it('should redirect to portal', function() {
|
||||
browser.driver.get('http://test1.example.com:' + process.env.TESTWEBSERVERPORT + '/');
|
||||
expect(browser.getCurrentUrl()).toMatch(new RegExp('^http://auth.example.com(:' + process.env.TESTWEBSERVERPORT + ')?/\\?url=aHR0cDovL3Rlc3QxLmV4YW1wbGUuY29tOjE5ODc2Lw=='));
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
#!/usr/bin/env perl
|
||||
|
||||
# TODO: remove this
|
||||
BEGIN {
|
||||
$pwd = `pwd`;
|
||||
chomp $pwd;
|
||||
eval qq{
|
||||
use lib "$pwd/../../lemonldap-ng-common/blib/lib";
|
||||
use lib "$pwd/../../lemonldap-ng-handler/blib/lib";
|
||||
use lib "$pwd/../../lemonldap-ng-portal/blib/lib";
|
||||
use lib "$pwd/../../lemonldap-ng-manager/blib/lib";
|
||||
};
|
||||
die $@ if ($@);
|
||||
}
|
||||
use Plack::Handler::FCGI;
|
||||
use Lemonldap::NG::Portal::Main;
|
||||
|
||||
# Roll your own
|
||||
my $server = Plack::Handler::FCGI->new();
|
||||
$server->run( Lemonldap::NG::Portal::Main->run( {} ) );
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
use Lemonldap::NG::Portal::Main;
|
||||
|
||||
Lemonldap::NG::Portal::Main->run( {} );
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/usr/bin/env perl
|
||||
|
||||
use warnings;
|
||||
|
||||
BEGIN {
|
||||
$pwd = `pwd`;
|
||||
chomp $pwd;
|
||||
eval qq{
|
||||
use lib "$pwd/../lemonldap-ng-common/blib/lib";
|
||||
use lib "$pwd/../lemonldap-ng-handler/blib/lib";
|
||||
use lib "$pwd/../lemonldap-ng-portal/blib/lib";
|
||||
use lib "$pwd/../lemonldap-ng-manager/blib/lib";
|
||||
};
|
||||
die $@ if ($@);
|
||||
}
|
||||
use Lemonldap::NG::Manager;
|
||||
use Plack::Handler::CGI;
|
||||
|
||||
Plack::Handler::CGI->new->run( Lemonldap::NG::Manager->run( {} ) );
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
#!/usr/bin/env perl
|
||||
|
||||
use warnings;
|
||||
|
||||
BEGIN {
|
||||
$pwd = `pwd`;
|
||||
chomp $pwd;
|
||||
eval qq{
|
||||
use lib "$pwd/../lemonldap-ng-common/blib/lib";
|
||||
use lib "$pwd/../lemonldap-ng-handler/blib/lib";
|
||||
use lib "$pwd/../lemonldap-ng-portal/blib/lib";
|
||||
use lib "$pwd/../lemonldap-ng-manager/blib/lib";
|
||||
};
|
||||
die $@ if ($@);
|
||||
}
|
||||
use Plack::Handler::FCGI;
|
||||
use Lemonldap::NG::Manager;
|
||||
|
||||
# Roll your own
|
||||
my $server = Plack::Handler::FCGI->new();
|
||||
|
||||
#$server->run(
|
||||
# sub {
|
||||
# use Data::Dumper;
|
||||
# return [ "200", [ 'Content-Type' => 'text/plain' ], [ Dumper(\@_,\%ENV) ] ];
|
||||
# }
|
||||
#);
|
||||
$server->run( Lemonldap::NG::Manager->run( {} ) );
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"directory": "site/static/bwr",
|
||||
"directory": "site/htdocs/static/bwr",
|
||||
"interactive": false
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,124 +32,126 @@ site/coffee/llApp.coffee
|
|||
site/coffee/manager.coffee
|
||||
site/coffee/notifications.coffee
|
||||
site/coffee/sessions.coffee
|
||||
site/static/bwr/angular-animate/angular-animate.js
|
||||
site/static/bwr/angular-animate/angular-animate.min.js
|
||||
site/static/bwr/angular-animate/angular-animate.min.js.map
|
||||
site/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js
|
||||
site/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js
|
||||
site/static/bwr/angular-cookies/angular-cookies.js
|
||||
site/static/bwr/angular-cookies/angular-cookies.min.js
|
||||
site/static/bwr/angular-cookies/angular-cookies.min.js.map
|
||||
site/static/bwr/angular-ui-tree/dist/angular-ui-tree.js
|
||||
site/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css
|
||||
site/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js
|
||||
site/static/bwr/angular/angular-csp.css
|
||||
site/static/bwr/angular/angular-csp.min.css
|
||||
site/static/bwr/angular/angular.js
|
||||
site/static/bwr/angular/angular.min.js
|
||||
site/static/bwr/angular/angular.min.js.map
|
||||
site/static/bwr/bootstrap/dist/css/bootstrap-theme.css
|
||||
site/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map
|
||||
site/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css
|
||||
site/static/bwr/bootstrap/dist/css/bootstrap.css
|
||||
site/static/bwr/bootstrap/dist/css/bootstrap.min.css
|
||||
site/static/bwr/bootstrap/dist/css/bootstrap.min.css.map
|
||||
site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
|
||||
site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
|
||||
site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
|
||||
site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
|
||||
site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
|
||||
site/static/bwr/es5-shim/es5-shim.js
|
||||
site/static/bwr/es5-shim/es5-shim.map
|
||||
site/static/bwr/es5-shim/es5-shim.min.js
|
||||
site/static/bwr/file-saver.js/FileSaver.js
|
||||
site/static/bwr/file-saver.js/FileSaver.min.js
|
||||
site/static/bwr/jquery/dist/jquery.js
|
||||
site/static/bwr/jquery/dist/jquery.min.js
|
||||
site/static/bwr/jquery/dist/jquery.min.map
|
||||
site/static/css/manager.css
|
||||
site/static/css/manager.min.css
|
||||
site/static/forms/authChoice.html
|
||||
site/static/forms/authChoiceContainer.html
|
||||
site/static/forms/authParams.html
|
||||
site/static/forms/authParamsText.html
|
||||
site/static/forms/authParamsTextContainer.html
|
||||
site/static/forms/blackWhiteList.html
|
||||
site/static/forms/bool.html
|
||||
site/static/forms/boolOrExpr.html
|
||||
site/static/forms/catAndAppList.html
|
||||
site/static/forms/cmbModule.html
|
||||
site/static/forms/cmbModuleContainer.html
|
||||
site/static/forms/doubleHash.html
|
||||
site/static/forms/file.html
|
||||
site/static/forms/grant.html
|
||||
site/static/forms/grantContainer.html
|
||||
site/static/forms/home.html
|
||||
site/static/forms/int.html
|
||||
site/static/forms/keyText.html
|
||||
site/static/forms/keyTextContainer.html
|
||||
site/static/forms/longtext.html
|
||||
site/static/forms/menuApp.html
|
||||
site/static/forms/menuCat.html
|
||||
site/static/forms/mini.html
|
||||
site/static/forms/oidcOPMetaDataNode.html
|
||||
site/static/forms/oidcOPMetaDataNodeContainer.html
|
||||
site/static/forms/oidcRPMetaDataNode.html
|
||||
site/static/forms/oidcRPMetaDataNodeContainer.html
|
||||
site/static/forms/password.html
|
||||
site/static/forms/portalskin.html
|
||||
site/static/forms/portalskinbackground.html
|
||||
site/static/forms/post.html
|
||||
site/static/forms/postContainer.html
|
||||
site/static/forms/README.md
|
||||
site/static/forms/restore.html
|
||||
site/static/forms/RSAKey.html
|
||||
site/static/forms/RSAKeyNoPassword.html
|
||||
site/static/forms/rule.html
|
||||
site/static/forms/ruleContainer.html
|
||||
site/static/forms/samlAssertion.html
|
||||
site/static/forms/samlAttribute.html
|
||||
site/static/forms/samlAttributeContainer.html
|
||||
site/static/forms/samlIDPMetaDataNode.html
|
||||
site/static/forms/samlIDPMetaDataNodeContainer.html
|
||||
site/static/forms/samlService.html
|
||||
site/static/forms/samlSPMetaDataNode.html
|
||||
site/static/forms/samlSPMetaDataNodeContainer.html
|
||||
site/static/forms/select.html
|
||||
site/static/forms/simpleInputContainer.html
|
||||
site/static/forms/text.html
|
||||
site/static/forms/trool.html
|
||||
site/static/forms/virtualHost.html
|
||||
site/static/forms/virtualHostContainer.html
|
||||
site/static/forms/white.html
|
||||
site/static/js/conftree.js
|
||||
site/static/js/conftree.min.js
|
||||
site/static/js/diff.js
|
||||
site/static/js/diff.min.js
|
||||
site/static/js/filterFunctions.js
|
||||
site/static/js/filterFunctions.min.js
|
||||
site/static/js/llApp.js
|
||||
site/static/js/llApp.min.js
|
||||
site/static/js/manager.js
|
||||
site/static/js/manager.min.js
|
||||
site/static/js/notifications.js
|
||||
site/static/js/notifications.min.js
|
||||
site/static/js/sessions.js
|
||||
site/static/js/sessions.min.js
|
||||
site/static/languages/en.json
|
||||
site/static/languages/fr.json
|
||||
site/static/logos/bootstrap.png
|
||||
site/static/logos/custom.png
|
||||
site/static/logos/dark.png
|
||||
site/static/logos/en.png
|
||||
site/static/logos/favicon.ico
|
||||
site/static/logos/fr.png
|
||||
site/static/logos/impact.png
|
||||
site/static/logos/llng-icon-32.png
|
||||
site/static/logos/llng-logo-32.png
|
||||
site/static/logos/pastel.png
|
||||
site/static/reverseTree.json
|
||||
site/static/struct.json
|
||||
site/htdocs/manager.fcgi
|
||||
site/htdocs/manager.psgi
|
||||
site/htdocs/static/bwr/angular-animate/angular-animate.js
|
||||
site/htdocs/static/bwr/angular-animate/angular-animate.min.js
|
||||
site/htdocs/static/bwr/angular-animate/angular-animate.min.js.map
|
||||
site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js
|
||||
site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js
|
||||
site/htdocs/static/bwr/angular-cookies/angular-cookies.js
|
||||
site/htdocs/static/bwr/angular-cookies/angular-cookies.min.js
|
||||
site/htdocs/static/bwr/angular-cookies/angular-cookies.min.js.map
|
||||
site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.js
|
||||
site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css
|
||||
site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js
|
||||
site/htdocs/static/bwr/angular/angular-csp.css
|
||||
site/htdocs/static/bwr/angular/angular-csp.min.css
|
||||
site/htdocs/static/bwr/angular/angular.js
|
||||
site/htdocs/static/bwr/angular/angular.min.js
|
||||
site/htdocs/static/bwr/angular/angular.min.js.map
|
||||
site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.css
|
||||
site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map
|
||||
site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css
|
||||
site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.css
|
||||
site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.min.css
|
||||
site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.min.css.map
|
||||
site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
|
||||
site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg
|
||||
site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
|
||||
site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
|
||||
site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2
|
||||
site/htdocs/static/bwr/es5-shim/es5-shim.js
|
||||
site/htdocs/static/bwr/es5-shim/es5-shim.map
|
||||
site/htdocs/static/bwr/es5-shim/es5-shim.min.js
|
||||
site/htdocs/static/bwr/file-saver.js/FileSaver.js
|
||||
site/htdocs/static/bwr/file-saver.js/FileSaver.min.js
|
||||
site/htdocs/static/bwr/jquery/dist/jquery.js
|
||||
site/htdocs/static/bwr/jquery/dist/jquery.min.js
|
||||
site/htdocs/static/bwr/jquery/dist/jquery.min.map
|
||||
site/htdocs/static/css/manager.css
|
||||
site/htdocs/static/css/manager.min.css
|
||||
site/htdocs/static/forms/authChoice.html
|
||||
site/htdocs/static/forms/authChoiceContainer.html
|
||||
site/htdocs/static/forms/authParams.html
|
||||
site/htdocs/static/forms/authParamsText.html
|
||||
site/htdocs/static/forms/authParamsTextContainer.html
|
||||
site/htdocs/static/forms/blackWhiteList.html
|
||||
site/htdocs/static/forms/bool.html
|
||||
site/htdocs/static/forms/boolOrExpr.html
|
||||
site/htdocs/static/forms/catAndAppList.html
|
||||
site/htdocs/static/forms/cmbModule.html
|
||||
site/htdocs/static/forms/cmbModuleContainer.html
|
||||
site/htdocs/static/forms/doubleHash.html
|
||||
site/htdocs/static/forms/file.html
|
||||
site/htdocs/static/forms/grant.html
|
||||
site/htdocs/static/forms/grantContainer.html
|
||||
site/htdocs/static/forms/home.html
|
||||
site/htdocs/static/forms/int.html
|
||||
site/htdocs/static/forms/keyText.html
|
||||
site/htdocs/static/forms/keyTextContainer.html
|
||||
site/htdocs/static/forms/longtext.html
|
||||
site/htdocs/static/forms/menuApp.html
|
||||
site/htdocs/static/forms/menuCat.html
|
||||
site/htdocs/static/forms/mini.html
|
||||
site/htdocs/static/forms/oidcOPMetaDataNode.html
|
||||
site/htdocs/static/forms/oidcOPMetaDataNodeContainer.html
|
||||
site/htdocs/static/forms/oidcRPMetaDataNode.html
|
||||
site/htdocs/static/forms/oidcRPMetaDataNodeContainer.html
|
||||
site/htdocs/static/forms/password.html
|
||||
site/htdocs/static/forms/portalskin.html
|
||||
site/htdocs/static/forms/portalskinbackground.html
|
||||
site/htdocs/static/forms/post.html
|
||||
site/htdocs/static/forms/postContainer.html
|
||||
site/htdocs/static/forms/README.md
|
||||
site/htdocs/static/forms/restore.html
|
||||
site/htdocs/static/forms/RSAKey.html
|
||||
site/htdocs/static/forms/RSAKeyNoPassword.html
|
||||
site/htdocs/static/forms/rule.html
|
||||
site/htdocs/static/forms/ruleContainer.html
|
||||
site/htdocs/static/forms/samlAssertion.html
|
||||
site/htdocs/static/forms/samlAttribute.html
|
||||
site/htdocs/static/forms/samlAttributeContainer.html
|
||||
site/htdocs/static/forms/samlIDPMetaDataNode.html
|
||||
site/htdocs/static/forms/samlIDPMetaDataNodeContainer.html
|
||||
site/htdocs/static/forms/samlService.html
|
||||
site/htdocs/static/forms/samlSPMetaDataNode.html
|
||||
site/htdocs/static/forms/samlSPMetaDataNodeContainer.html
|
||||
site/htdocs/static/forms/select.html
|
||||
site/htdocs/static/forms/simpleInputContainer.html
|
||||
site/htdocs/static/forms/text.html
|
||||
site/htdocs/static/forms/trool.html
|
||||
site/htdocs/static/forms/virtualHost.html
|
||||
site/htdocs/static/forms/virtualHostContainer.html
|
||||
site/htdocs/static/forms/white.html
|
||||
site/htdocs/static/js/conftree.js
|
||||
site/htdocs/static/js/conftree.min.js
|
||||
site/htdocs/static/js/diff.js
|
||||
site/htdocs/static/js/diff.min.js
|
||||
site/htdocs/static/js/filterFunctions.js
|
||||
site/htdocs/static/js/filterFunctions.min.js
|
||||
site/htdocs/static/js/llApp.js
|
||||
site/htdocs/static/js/llApp.min.js
|
||||
site/htdocs/static/js/manager.js
|
||||
site/htdocs/static/js/manager.min.js
|
||||
site/htdocs/static/js/notifications.js
|
||||
site/htdocs/static/js/notifications.min.js
|
||||
site/htdocs/static/js/sessions.js
|
||||
site/htdocs/static/js/sessions.min.js
|
||||
site/htdocs/static/languages/en.json
|
||||
site/htdocs/static/languages/fr.json
|
||||
site/htdocs/static/logos/bootstrap.png
|
||||
site/htdocs/static/logos/custom.png
|
||||
site/htdocs/static/logos/dark.png
|
||||
site/htdocs/static/logos/en.png
|
||||
site/htdocs/static/logos/favicon.ico
|
||||
site/htdocs/static/logos/fr.png
|
||||
site/htdocs/static/logos/impact.png
|
||||
site/htdocs/static/logos/llng-icon-32.png
|
||||
site/htdocs/static/logos/llng-logo-32.png
|
||||
site/htdocs/static/logos/pastel.png
|
||||
site/htdocs/static/reverseTree.json
|
||||
site/htdocs/static/struct.json
|
||||
site/templates/diff.tpl
|
||||
site/templates/footer.tpl
|
||||
site/templates/header.tpl
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
#!/usr/bin/env perl
|
||||
|
||||
use Plack::Handler::FCGI;
|
||||
use Lemonldap::NG::Manager;
|
||||
|
||||
# Roll your own
|
||||
my $server = Plack::Handler::FCGI->new();
|
||||
$server->run( Lemonldap::NG::Manager->run( {} ) );
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env plackup
|
||||
|
||||
use Lemonldap::NG::Manager;
|
||||
|
||||
Lemonldap::NG::Manager->run({});
|
||||
|
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue