From d3766ff37a07ff524fb39f2d3b607c5d0cd7ddb8 Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Wed, 22 Feb 2017 21:48:52 +0000 Subject: [PATCH] Harmonize manager to portal (dir htdocs) --- Makefile | 55 ++-- _example/etc/manager-apache2.4.conf | 14 +- _example/etc/manager-apache2.X.conf | 14 +- _example/etc/manager-apache2.conf | 14 +- _example/etc/manager-nginx.conf | 8 +- e2e-tests/handler/11-logout_app_sso.js | 4 +- e2e-tests/index.fcgi | 20 -- e2e-tests/index.psgi | 3 - e2e-tests/manager-server.cgi | 20 -- e2e-tests/manager-server.fcgi | 28 --- lemonldap-ng-manager/.bowerrc | 2 +- lemonldap-ng-manager/MANIFEST | 238 +++++++++--------- lemonldap-ng-manager/site/htdocs/manager.fcgi | 8 + lemonldap-ng-manager/site/htdocs/manager.psgi | 5 + .../bwr/angular-animate/angular-animate.js | 0 .../angular-animate/angular-animate.min.js | 0 .../angular-animate.min.js.map | 0 .../angular-bootstrap/ui-bootstrap-tpls.js | 0 .../ui-bootstrap-tpls.min.js | 0 .../bwr/angular-cookies/angular-cookies.js | 0 .../angular-cookies/angular-cookies.min.js | 0 .../angular-cookies.min.js.map | 0 .../angular-ui-tree/dist/angular-ui-tree.js | 0 .../dist/angular-ui-tree.min.css | 0 .../dist/angular-ui-tree.min.js | 0 .../static/bwr/angular/angular-csp.css | 0 .../static/bwr/angular/angular-csp.min.css | 0 .../static/bwr/angular/angular.js | 0 .../static/bwr/angular/angular.min.js | 0 .../static/bwr/angular/angular.min.js.map | 0 .../bootstrap/dist/css/bootstrap-theme.css | 0 .../dist/css/bootstrap-theme.css.map | 0 .../dist/css/bootstrap-theme.min.css | 0 .../bwr/bootstrap/dist/css/bootstrap.css | 0 .../bwr/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../static/bwr/es5-shim/es5-shim.js | 0 .../static/bwr/es5-shim/es5-shim.map | 0 .../static/bwr/es5-shim/es5-shim.min.js | 0 .../static/bwr/file-saver.js/FileSaver.js | 0 .../static/bwr/file-saver.js/FileSaver.min.js | 0 .../static/bwr/jquery/dist/jquery.js | 0 .../static/bwr/jquery/dist/jquery.min.js | 0 .../static/bwr/jquery/dist/jquery.min.map | 0 .../site/{ => htdocs}/static/css/manager.css | 0 .../{ => htdocs}/static/css/manager.min.css | 0 .../site/{ => htdocs}/static/forms/README.md | 0 .../{ => htdocs}/static/forms/RSAKey.html | 0 .../static/forms/RSAKeyNoPassword.html | 0 .../{ => htdocs}/static/forms/authChoice.html | 0 .../static/forms/authChoiceContainer.html | 0 .../{ => htdocs}/static/forms/authParams.html | 0 .../static/forms/authParamsText.html | 0 .../static/forms/authParamsTextContainer.html | 0 .../static/forms/blackWhiteList.html | 0 .../site/{ => htdocs}/static/forms/bool.html | 0 .../{ => htdocs}/static/forms/boolOrExpr.html | 0 .../static/forms/catAndAppList.html | 0 .../{ => htdocs}/static/forms/cmbModule.html | 0 .../static/forms/cmbModuleContainer.html | 0 .../{ => htdocs}/static/forms/doubleHash.html | 0 .../site/{ => htdocs}/static/forms/file.html | 0 .../site/{ => htdocs}/static/forms/grant.html | 0 .../static/forms/grantContainer.html | 0 .../site/{ => htdocs}/static/forms/home.html | 0 .../site/{ => htdocs}/static/forms/int.html | 0 .../{ => htdocs}/static/forms/keyText.html | 0 .../static/forms/keyTextContainer.html | 0 .../{ => htdocs}/static/forms/longtext.html | 0 .../{ => htdocs}/static/forms/menuApp.html | 0 .../{ => htdocs}/static/forms/menuCat.html | 0 .../site/{ => htdocs}/static/forms/mini.html | 0 .../static/forms/oidcOPMetaDataNode.html | 0 .../forms/oidcOPMetaDataNodeContainer.html | 0 .../static/forms/oidcRPMetaDataNode.html | 0 .../forms/oidcRPMetaDataNodeContainer.html | 0 .../{ => htdocs}/static/forms/password.html | 0 .../{ => htdocs}/static/forms/portalskin.html | 0 .../static/forms/portalskinbackground.html | 0 .../site/{ => htdocs}/static/forms/post.html | 0 .../static/forms/postContainer.html | 0 .../{ => htdocs}/static/forms/restore.html | 0 .../site/{ => htdocs}/static/forms/rule.html | 0 .../static/forms/ruleContainer.html | 0 .../static/forms/samlAssertion.html | 0 .../static/forms/samlAttribute.html | 0 .../static/forms/samlAttributeContainer.html | 0 .../static/forms/samlIDPMetaDataNode.html | 0 .../forms/samlIDPMetaDataNodeContainer.html | 0 .../static/forms/samlSPMetaDataNode.html | 0 .../forms/samlSPMetaDataNodeContainer.html | 0 .../static/forms/samlService.html | 0 .../{ => htdocs}/static/forms/select.html | 0 .../static/forms/simpleInputContainer.html | 0 .../site/{ => htdocs}/static/forms/text.html | 0 .../site/{ => htdocs}/static/forms/trool.html | 0 .../static/forms/virtualHost.html | 0 .../static/forms/virtualHostContainer.html | 0 .../site/{ => htdocs}/static/forms/white.html | 0 .../site/{ => htdocs}/static/js/conftree.js | 0 .../{ => htdocs}/static/js/conftree.min.js | 0 .../site/{ => htdocs}/static/js/diff.js | 0 .../site/{ => htdocs}/static/js/diff.min.js | 0 .../{ => htdocs}/static/js/filterFunctions.js | 0 .../static/js/filterFunctions.min.js | 0 .../site/{ => htdocs}/static/js/llApp.js | 0 .../site/{ => htdocs}/static/js/llApp.min.js | 0 .../site/{ => htdocs}/static/js/manager.js | 0 .../{ => htdocs}/static/js/manager.min.js | 0 .../{ => htdocs}/static/js/notifications.js | 0 .../static/js/notifications.min.js | 0 .../site/{ => htdocs}/static/js/sessions.js | 0 .../{ => htdocs}/static/js/sessions.min.js | 0 .../{ => htdocs}/static/languages/en.json | 0 .../{ => htdocs}/static/languages/fr.json | 0 .../{ => htdocs}/static/logos/bootstrap.png | Bin .../site/{ => htdocs}/static/logos/custom.png | Bin .../site/{ => htdocs}/static/logos/dark.png | Bin .../site/{ => htdocs}/static/logos/en.png | Bin .../{ => htdocs}/static/logos/favicon.ico | Bin .../site/{ => htdocs}/static/logos/fr.png | Bin .../site/{ => htdocs}/static/logos/impact.png | Bin .../static/logos/llng-icon-32.png | Bin .../static/logos/llng-logo-32.png | Bin .../site/{ => htdocs}/static/logos/pastel.png | Bin .../site/{ => htdocs}/static/reverseTree.json | 0 .../site/{ => htdocs}/static/struct.json | 0 lemonldap-ng-manager/t/03-HTML-forms.t | 2 +- lemonldap-ng-manager/t/05-rest-api.t | 2 +- lemonldap-ng-manager/t/90-translations.t | 4 +- scripts/jsongenerator.pl | 6 +- 136 files changed, 189 insertions(+), 258 deletions(-) delete mode 100755 e2e-tests/index.fcgi delete mode 100644 e2e-tests/index.psgi delete mode 100755 e2e-tests/manager-server.cgi delete mode 100755 e2e-tests/manager-server.fcgi create mode 100755 lemonldap-ng-manager/site/htdocs/manager.fcgi create mode 100644 lemonldap-ng-manager/site/htdocs/manager.psgi rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-animate/angular-animate.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-animate/angular-animate.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-animate/angular-animate.min.js.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-cookies/angular-cookies.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-cookies/angular-cookies.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-cookies/angular-cookies.min.js.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-ui-tree/dist/angular-ui-tree.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular/angular-csp.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular/angular-csp.min.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular/angular.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular/angular.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/angular/angular.min.js.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/css/bootstrap-theme.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/css/bootstrap.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/css/bootstrap.min.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/css/bootstrap.min.css.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/es5-shim/es5-shim.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/es5-shim/es5-shim.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/es5-shim/es5-shim.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/file-saver.js/FileSaver.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/file-saver.js/FileSaver.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/jquery/dist/jquery.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/jquery/dist/jquery.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/bwr/jquery/dist/jquery.min.map (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/css/manager.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/css/manager.min.css (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/README.md (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/RSAKey.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/RSAKeyNoPassword.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/authChoice.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/authChoiceContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/authParams.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/authParamsText.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/authParamsTextContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/blackWhiteList.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/bool.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/boolOrExpr.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/catAndAppList.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/cmbModule.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/cmbModuleContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/doubleHash.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/file.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/grant.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/grantContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/home.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/int.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/keyText.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/keyTextContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/longtext.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/menuApp.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/menuCat.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/mini.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/oidcOPMetaDataNode.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/oidcOPMetaDataNodeContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/oidcRPMetaDataNode.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/oidcRPMetaDataNodeContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/password.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/portalskin.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/portalskinbackground.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/post.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/postContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/restore.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/rule.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/ruleContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlAssertion.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlAttribute.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlAttributeContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlIDPMetaDataNode.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlIDPMetaDataNodeContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlSPMetaDataNode.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlSPMetaDataNodeContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/samlService.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/select.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/simpleInputContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/text.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/trool.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/virtualHost.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/virtualHostContainer.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/forms/white.html (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/conftree.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/conftree.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/diff.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/diff.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/filterFunctions.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/filterFunctions.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/llApp.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/llApp.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/manager.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/manager.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/notifications.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/notifications.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/sessions.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/js/sessions.min.js (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/languages/en.json (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/languages/fr.json (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/bootstrap.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/custom.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/dark.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/en.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/favicon.ico (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/fr.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/impact.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/llng-icon-32.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/llng-logo-32.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/logos/pastel.png (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/reverseTree.json (100%) rename lemonldap-ng-manager/site/{ => htdocs}/static/struct.json (100%) diff --git a/Makefile b/Makefile index c652f05db..55991e485 100644 --- a/Makefile +++ b/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 diff --git a/_example/etc/manager-apache2.4.conf b/_example/etc/manager-apache2.4.conf index 03151dd68..f0d4375b3 100644 --- a/_example/etc/manager-apache2.4.conf +++ b/_example/etc/manager-apache2.4.conf @@ -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 - + SetHandler fcgid-script Options +ExecCGI @@ -46,13 +43,10 @@ header set X-Frame-Options DENY header set X-XSS-Protection "1; mode=block" - + # 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 # -------------------- diff --git a/_example/etc/manager-apache2.X.conf b/_example/etc/manager-apache2.X.conf index 60b169919..5d1b6ea08 100644 --- a/_example/etc/manager-apache2.X.conf +++ b/_example/etc/manager-apache2.X.conf @@ -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 - + SetHandler fcgid-script Options +ExecCGI @@ -46,13 +43,10 @@ header set X-Frame-Options DENY header set X-XSS-Protection "1; mode=block" - + # 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 # -------------------- diff --git a/_example/etc/manager-apache2.conf b/_example/etc/manager-apache2.conf index e75f6dfcd..dd3e7b988 100644 --- a/_example/etc/manager-apache2.conf +++ b/_example/etc/manager-apache2.conf @@ -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 - + SetHandler fcgid-script Options +ExecCGI @@ -46,13 +43,10 @@ header set X-Frame-Options DENY header set X-XSS-Protection "1; mode=block" - + # 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 # -------------------- diff --git a/_example/etc/manager-nginx.conf b/_example/etc/manager-nginx.conf index 3498158a7..0df4ab120 100644 --- a/_example/etc/manager-nginx.conf +++ b/_example/etc/manager-nginx.conf @@ -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/ { diff --git a/e2e-tests/handler/11-logout_app_sso.js b/e2e-tests/handler/11-logout_app_sso.js index ddd46e7a8..5ac328ee9 100644 --- a/e2e-tests/handler/11-logout_app_sso.js +++ b/e2e-tests/handler/11-logout_app_sso.js @@ -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==')); }); }); -}); \ No newline at end of file +}); diff --git a/e2e-tests/index.fcgi b/e2e-tests/index.fcgi deleted file mode 100755 index 86e60c5d6..000000000 --- a/e2e-tests/index.fcgi +++ /dev/null @@ -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( {} ) ); diff --git a/e2e-tests/index.psgi b/e2e-tests/index.psgi deleted file mode 100644 index 91a0415cc..000000000 --- a/e2e-tests/index.psgi +++ /dev/null @@ -1,3 +0,0 @@ -use Lemonldap::NG::Portal::Main; - -Lemonldap::NG::Portal::Main->run( {} ); diff --git a/e2e-tests/manager-server.cgi b/e2e-tests/manager-server.cgi deleted file mode 100755 index aa955501f..000000000 --- a/e2e-tests/manager-server.cgi +++ /dev/null @@ -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( {} ) ); - diff --git a/e2e-tests/manager-server.fcgi b/e2e-tests/manager-server.fcgi deleted file mode 100755 index 2c413a76a..000000000 --- a/e2e-tests/manager-server.fcgi +++ /dev/null @@ -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( {} ) ); diff --git a/lemonldap-ng-manager/.bowerrc b/lemonldap-ng-manager/.bowerrc index 66c72a8c1..792f4fa9e 100644 --- a/lemonldap-ng-manager/.bowerrc +++ b/lemonldap-ng-manager/.bowerrc @@ -1,4 +1,4 @@ { - "directory": "site/static/bwr", + "directory": "site/htdocs/static/bwr", "interactive": false } diff --git a/lemonldap-ng-manager/MANIFEST b/lemonldap-ng-manager/MANIFEST index 2eb29c609..0932244bb 100644 --- a/lemonldap-ng-manager/MANIFEST +++ b/lemonldap-ng-manager/MANIFEST @@ -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 diff --git a/lemonldap-ng-manager/site/htdocs/manager.fcgi b/lemonldap-ng-manager/site/htdocs/manager.fcgi new file mode 100755 index 000000000..9d5bcbd4f --- /dev/null +++ b/lemonldap-ng-manager/site/htdocs/manager.fcgi @@ -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( {} ) ); diff --git a/lemonldap-ng-manager/site/htdocs/manager.psgi b/lemonldap-ng-manager/site/htdocs/manager.psgi new file mode 100644 index 000000000..ed3dffec2 --- /dev/null +++ b/lemonldap-ng-manager/site/htdocs/manager.psgi @@ -0,0 +1,5 @@ +#!/usr/bin/env plackup + +use Lemonldap::NG::Manager; + +Lemonldap::NG::Manager->run({}); diff --git a/lemonldap-ng-manager/site/static/bwr/angular-animate/angular-animate.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-animate/angular-animate.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-animate/angular-animate.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-animate/angular-animate.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-animate/angular-animate.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-animate/angular-animate.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-animate/angular-animate.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-animate/angular-animate.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-animate/angular-animate.min.js.map b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-animate/angular-animate.min.js.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-animate/angular-animate.min.js.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-animate/angular-animate.min.js.map diff --git a/lemonldap-ng-manager/site/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-bootstrap/ui-bootstrap-tpls.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-cookies/angular-cookies.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-cookies/angular-cookies.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-cookies/angular-cookies.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-cookies/angular-cookies.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-cookies/angular-cookies.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-cookies/angular-cookies.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-cookies/angular-cookies.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-cookies/angular-cookies.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-cookies/angular-cookies.min.js.map b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-cookies/angular-cookies.min.js.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-cookies/angular-cookies.min.js.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-cookies/angular-cookies.min.js.map diff --git a/lemonldap-ng-manager/site/static/bwr/angular-ui-tree/dist/angular-ui-tree.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-ui-tree/dist/angular-ui-tree.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.css diff --git a/lemonldap-ng-manager/site/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular-ui-tree/dist/angular-ui-tree.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular/angular-csp.css b/lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular-csp.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular/angular-csp.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular-csp.css diff --git a/lemonldap-ng-manager/site/static/bwr/angular/angular-csp.min.css b/lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular-csp.min.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular/angular-csp.min.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular-csp.min.css diff --git a/lemonldap-ng-manager/site/static/bwr/angular/angular.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular/angular.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular/angular.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular/angular.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/angular/angular.min.js.map b/lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular.min.js.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/angular/angular.min.js.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/angular/angular.min.js.map diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap-theme.css b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap-theme.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.css diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.css.map diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap-theme.min.css diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap.css b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.css diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap.min.css b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.min.css similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap.min.css rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.min.css diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap.min.css.map b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.min.css.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/css/bootstrap.min.css.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/css/bootstrap.min.css.map diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.eot diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.svg diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff diff --git a/lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 b/lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 rename to lemonldap-ng-manager/site/htdocs/static/bwr/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2 diff --git a/lemonldap-ng-manager/site/static/bwr/es5-shim/es5-shim.js b/lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/es5-shim/es5-shim.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.js diff --git a/lemonldap-ng-manager/site/static/bwr/es5-shim/es5-shim.map b/lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/es5-shim/es5-shim.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.map diff --git a/lemonldap-ng-manager/site/static/bwr/es5-shim/es5-shim.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/es5-shim/es5-shim.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/es5-shim/es5-shim.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/file-saver.js/FileSaver.js b/lemonldap-ng-manager/site/htdocs/static/bwr/file-saver.js/FileSaver.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/file-saver.js/FileSaver.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/file-saver.js/FileSaver.js diff --git a/lemonldap-ng-manager/site/static/bwr/file-saver.js/FileSaver.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/file-saver.js/FileSaver.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/file-saver.js/FileSaver.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/file-saver.js/FileSaver.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/jquery/dist/jquery.js b/lemonldap-ng-manager/site/htdocs/static/bwr/jquery/dist/jquery.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/jquery/dist/jquery.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/jquery/dist/jquery.js diff --git a/lemonldap-ng-manager/site/static/bwr/jquery/dist/jquery.min.js b/lemonldap-ng-manager/site/htdocs/static/bwr/jquery/dist/jquery.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/jquery/dist/jquery.min.js rename to lemonldap-ng-manager/site/htdocs/static/bwr/jquery/dist/jquery.min.js diff --git a/lemonldap-ng-manager/site/static/bwr/jquery/dist/jquery.min.map b/lemonldap-ng-manager/site/htdocs/static/bwr/jquery/dist/jquery.min.map similarity index 100% rename from lemonldap-ng-manager/site/static/bwr/jquery/dist/jquery.min.map rename to lemonldap-ng-manager/site/htdocs/static/bwr/jquery/dist/jquery.min.map diff --git a/lemonldap-ng-manager/site/static/css/manager.css b/lemonldap-ng-manager/site/htdocs/static/css/manager.css similarity index 100% rename from lemonldap-ng-manager/site/static/css/manager.css rename to lemonldap-ng-manager/site/htdocs/static/css/manager.css diff --git a/lemonldap-ng-manager/site/static/css/manager.min.css b/lemonldap-ng-manager/site/htdocs/static/css/manager.min.css similarity index 100% rename from lemonldap-ng-manager/site/static/css/manager.min.css rename to lemonldap-ng-manager/site/htdocs/static/css/manager.min.css diff --git a/lemonldap-ng-manager/site/static/forms/README.md b/lemonldap-ng-manager/site/htdocs/static/forms/README.md similarity index 100% rename from lemonldap-ng-manager/site/static/forms/README.md rename to lemonldap-ng-manager/site/htdocs/static/forms/README.md diff --git a/lemonldap-ng-manager/site/static/forms/RSAKey.html b/lemonldap-ng-manager/site/htdocs/static/forms/RSAKey.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/RSAKey.html rename to lemonldap-ng-manager/site/htdocs/static/forms/RSAKey.html diff --git a/lemonldap-ng-manager/site/static/forms/RSAKeyNoPassword.html b/lemonldap-ng-manager/site/htdocs/static/forms/RSAKeyNoPassword.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/RSAKeyNoPassword.html rename to lemonldap-ng-manager/site/htdocs/static/forms/RSAKeyNoPassword.html diff --git a/lemonldap-ng-manager/site/static/forms/authChoice.html b/lemonldap-ng-manager/site/htdocs/static/forms/authChoice.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/authChoice.html rename to lemonldap-ng-manager/site/htdocs/static/forms/authChoice.html diff --git a/lemonldap-ng-manager/site/static/forms/authChoiceContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/authChoiceContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/authChoiceContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/authChoiceContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/authParams.html b/lemonldap-ng-manager/site/htdocs/static/forms/authParams.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/authParams.html rename to lemonldap-ng-manager/site/htdocs/static/forms/authParams.html diff --git a/lemonldap-ng-manager/site/static/forms/authParamsText.html b/lemonldap-ng-manager/site/htdocs/static/forms/authParamsText.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/authParamsText.html rename to lemonldap-ng-manager/site/htdocs/static/forms/authParamsText.html diff --git a/lemonldap-ng-manager/site/static/forms/authParamsTextContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/authParamsTextContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/authParamsTextContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/authParamsTextContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/blackWhiteList.html b/lemonldap-ng-manager/site/htdocs/static/forms/blackWhiteList.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/blackWhiteList.html rename to lemonldap-ng-manager/site/htdocs/static/forms/blackWhiteList.html diff --git a/lemonldap-ng-manager/site/static/forms/bool.html b/lemonldap-ng-manager/site/htdocs/static/forms/bool.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/bool.html rename to lemonldap-ng-manager/site/htdocs/static/forms/bool.html diff --git a/lemonldap-ng-manager/site/static/forms/boolOrExpr.html b/lemonldap-ng-manager/site/htdocs/static/forms/boolOrExpr.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/boolOrExpr.html rename to lemonldap-ng-manager/site/htdocs/static/forms/boolOrExpr.html diff --git a/lemonldap-ng-manager/site/static/forms/catAndAppList.html b/lemonldap-ng-manager/site/htdocs/static/forms/catAndAppList.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/catAndAppList.html rename to lemonldap-ng-manager/site/htdocs/static/forms/catAndAppList.html diff --git a/lemonldap-ng-manager/site/static/forms/cmbModule.html b/lemonldap-ng-manager/site/htdocs/static/forms/cmbModule.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/cmbModule.html rename to lemonldap-ng-manager/site/htdocs/static/forms/cmbModule.html diff --git a/lemonldap-ng-manager/site/static/forms/cmbModuleContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/cmbModuleContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/cmbModuleContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/cmbModuleContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/doubleHash.html b/lemonldap-ng-manager/site/htdocs/static/forms/doubleHash.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/doubleHash.html rename to lemonldap-ng-manager/site/htdocs/static/forms/doubleHash.html diff --git a/lemonldap-ng-manager/site/static/forms/file.html b/lemonldap-ng-manager/site/htdocs/static/forms/file.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/file.html rename to lemonldap-ng-manager/site/htdocs/static/forms/file.html diff --git a/lemonldap-ng-manager/site/static/forms/grant.html b/lemonldap-ng-manager/site/htdocs/static/forms/grant.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/grant.html rename to lemonldap-ng-manager/site/htdocs/static/forms/grant.html diff --git a/lemonldap-ng-manager/site/static/forms/grantContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/grantContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/grantContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/grantContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/home.html b/lemonldap-ng-manager/site/htdocs/static/forms/home.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/home.html rename to lemonldap-ng-manager/site/htdocs/static/forms/home.html diff --git a/lemonldap-ng-manager/site/static/forms/int.html b/lemonldap-ng-manager/site/htdocs/static/forms/int.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/int.html rename to lemonldap-ng-manager/site/htdocs/static/forms/int.html diff --git a/lemonldap-ng-manager/site/static/forms/keyText.html b/lemonldap-ng-manager/site/htdocs/static/forms/keyText.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/keyText.html rename to lemonldap-ng-manager/site/htdocs/static/forms/keyText.html diff --git a/lemonldap-ng-manager/site/static/forms/keyTextContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/keyTextContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/keyTextContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/keyTextContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/longtext.html b/lemonldap-ng-manager/site/htdocs/static/forms/longtext.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/longtext.html rename to lemonldap-ng-manager/site/htdocs/static/forms/longtext.html diff --git a/lemonldap-ng-manager/site/static/forms/menuApp.html b/lemonldap-ng-manager/site/htdocs/static/forms/menuApp.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/menuApp.html rename to lemonldap-ng-manager/site/htdocs/static/forms/menuApp.html diff --git a/lemonldap-ng-manager/site/static/forms/menuCat.html b/lemonldap-ng-manager/site/htdocs/static/forms/menuCat.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/menuCat.html rename to lemonldap-ng-manager/site/htdocs/static/forms/menuCat.html diff --git a/lemonldap-ng-manager/site/static/forms/mini.html b/lemonldap-ng-manager/site/htdocs/static/forms/mini.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/mini.html rename to lemonldap-ng-manager/site/htdocs/static/forms/mini.html diff --git a/lemonldap-ng-manager/site/static/forms/oidcOPMetaDataNode.html b/lemonldap-ng-manager/site/htdocs/static/forms/oidcOPMetaDataNode.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/oidcOPMetaDataNode.html rename to lemonldap-ng-manager/site/htdocs/static/forms/oidcOPMetaDataNode.html diff --git a/lemonldap-ng-manager/site/static/forms/oidcOPMetaDataNodeContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/oidcOPMetaDataNodeContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/oidcOPMetaDataNodeContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/oidcOPMetaDataNodeContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/oidcRPMetaDataNode.html b/lemonldap-ng-manager/site/htdocs/static/forms/oidcRPMetaDataNode.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/oidcRPMetaDataNode.html rename to lemonldap-ng-manager/site/htdocs/static/forms/oidcRPMetaDataNode.html diff --git a/lemonldap-ng-manager/site/static/forms/oidcRPMetaDataNodeContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/oidcRPMetaDataNodeContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/oidcRPMetaDataNodeContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/oidcRPMetaDataNodeContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/password.html b/lemonldap-ng-manager/site/htdocs/static/forms/password.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/password.html rename to lemonldap-ng-manager/site/htdocs/static/forms/password.html diff --git a/lemonldap-ng-manager/site/static/forms/portalskin.html b/lemonldap-ng-manager/site/htdocs/static/forms/portalskin.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/portalskin.html rename to lemonldap-ng-manager/site/htdocs/static/forms/portalskin.html diff --git a/lemonldap-ng-manager/site/static/forms/portalskinbackground.html b/lemonldap-ng-manager/site/htdocs/static/forms/portalskinbackground.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/portalskinbackground.html rename to lemonldap-ng-manager/site/htdocs/static/forms/portalskinbackground.html diff --git a/lemonldap-ng-manager/site/static/forms/post.html b/lemonldap-ng-manager/site/htdocs/static/forms/post.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/post.html rename to lemonldap-ng-manager/site/htdocs/static/forms/post.html diff --git a/lemonldap-ng-manager/site/static/forms/postContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/postContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/postContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/postContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/restore.html b/lemonldap-ng-manager/site/htdocs/static/forms/restore.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/restore.html rename to lemonldap-ng-manager/site/htdocs/static/forms/restore.html diff --git a/lemonldap-ng-manager/site/static/forms/rule.html b/lemonldap-ng-manager/site/htdocs/static/forms/rule.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/rule.html rename to lemonldap-ng-manager/site/htdocs/static/forms/rule.html diff --git a/lemonldap-ng-manager/site/static/forms/ruleContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/ruleContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/ruleContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/ruleContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/samlAssertion.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlAssertion.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlAssertion.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlAssertion.html diff --git a/lemonldap-ng-manager/site/static/forms/samlAttribute.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlAttribute.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlAttribute.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlAttribute.html diff --git a/lemonldap-ng-manager/site/static/forms/samlAttributeContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlAttributeContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlAttributeContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlAttributeContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/samlIDPMetaDataNode.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlIDPMetaDataNode.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlIDPMetaDataNode.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlIDPMetaDataNode.html diff --git a/lemonldap-ng-manager/site/static/forms/samlIDPMetaDataNodeContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlIDPMetaDataNodeContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlIDPMetaDataNodeContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlIDPMetaDataNodeContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/samlSPMetaDataNode.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlSPMetaDataNode.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlSPMetaDataNode.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlSPMetaDataNode.html diff --git a/lemonldap-ng-manager/site/static/forms/samlSPMetaDataNodeContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlSPMetaDataNodeContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlSPMetaDataNodeContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlSPMetaDataNodeContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/samlService.html b/lemonldap-ng-manager/site/htdocs/static/forms/samlService.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/samlService.html rename to lemonldap-ng-manager/site/htdocs/static/forms/samlService.html diff --git a/lemonldap-ng-manager/site/static/forms/select.html b/lemonldap-ng-manager/site/htdocs/static/forms/select.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/select.html rename to lemonldap-ng-manager/site/htdocs/static/forms/select.html diff --git a/lemonldap-ng-manager/site/static/forms/simpleInputContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/simpleInputContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/simpleInputContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/simpleInputContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/text.html b/lemonldap-ng-manager/site/htdocs/static/forms/text.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/text.html rename to lemonldap-ng-manager/site/htdocs/static/forms/text.html diff --git a/lemonldap-ng-manager/site/static/forms/trool.html b/lemonldap-ng-manager/site/htdocs/static/forms/trool.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/trool.html rename to lemonldap-ng-manager/site/htdocs/static/forms/trool.html diff --git a/lemonldap-ng-manager/site/static/forms/virtualHost.html b/lemonldap-ng-manager/site/htdocs/static/forms/virtualHost.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/virtualHost.html rename to lemonldap-ng-manager/site/htdocs/static/forms/virtualHost.html diff --git a/lemonldap-ng-manager/site/static/forms/virtualHostContainer.html b/lemonldap-ng-manager/site/htdocs/static/forms/virtualHostContainer.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/virtualHostContainer.html rename to lemonldap-ng-manager/site/htdocs/static/forms/virtualHostContainer.html diff --git a/lemonldap-ng-manager/site/static/forms/white.html b/lemonldap-ng-manager/site/htdocs/static/forms/white.html similarity index 100% rename from lemonldap-ng-manager/site/static/forms/white.html rename to lemonldap-ng-manager/site/htdocs/static/forms/white.html diff --git a/lemonldap-ng-manager/site/static/js/conftree.js b/lemonldap-ng-manager/site/htdocs/static/js/conftree.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/conftree.js rename to lemonldap-ng-manager/site/htdocs/static/js/conftree.js diff --git a/lemonldap-ng-manager/site/static/js/conftree.min.js b/lemonldap-ng-manager/site/htdocs/static/js/conftree.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/conftree.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/conftree.min.js diff --git a/lemonldap-ng-manager/site/static/js/diff.js b/lemonldap-ng-manager/site/htdocs/static/js/diff.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/diff.js rename to lemonldap-ng-manager/site/htdocs/static/js/diff.js diff --git a/lemonldap-ng-manager/site/static/js/diff.min.js b/lemonldap-ng-manager/site/htdocs/static/js/diff.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/diff.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/diff.min.js diff --git a/lemonldap-ng-manager/site/static/js/filterFunctions.js b/lemonldap-ng-manager/site/htdocs/static/js/filterFunctions.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/filterFunctions.js rename to lemonldap-ng-manager/site/htdocs/static/js/filterFunctions.js diff --git a/lemonldap-ng-manager/site/static/js/filterFunctions.min.js b/lemonldap-ng-manager/site/htdocs/static/js/filterFunctions.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/filterFunctions.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/filterFunctions.min.js diff --git a/lemonldap-ng-manager/site/static/js/llApp.js b/lemonldap-ng-manager/site/htdocs/static/js/llApp.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/llApp.js rename to lemonldap-ng-manager/site/htdocs/static/js/llApp.js diff --git a/lemonldap-ng-manager/site/static/js/llApp.min.js b/lemonldap-ng-manager/site/htdocs/static/js/llApp.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/llApp.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/llApp.min.js diff --git a/lemonldap-ng-manager/site/static/js/manager.js b/lemonldap-ng-manager/site/htdocs/static/js/manager.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/manager.js rename to lemonldap-ng-manager/site/htdocs/static/js/manager.js diff --git a/lemonldap-ng-manager/site/static/js/manager.min.js b/lemonldap-ng-manager/site/htdocs/static/js/manager.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/manager.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/manager.min.js diff --git a/lemonldap-ng-manager/site/static/js/notifications.js b/lemonldap-ng-manager/site/htdocs/static/js/notifications.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/notifications.js rename to lemonldap-ng-manager/site/htdocs/static/js/notifications.js diff --git a/lemonldap-ng-manager/site/static/js/notifications.min.js b/lemonldap-ng-manager/site/htdocs/static/js/notifications.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/notifications.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/notifications.min.js diff --git a/lemonldap-ng-manager/site/static/js/sessions.js b/lemonldap-ng-manager/site/htdocs/static/js/sessions.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/sessions.js rename to lemonldap-ng-manager/site/htdocs/static/js/sessions.js diff --git a/lemonldap-ng-manager/site/static/js/sessions.min.js b/lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js similarity index 100% rename from lemonldap-ng-manager/site/static/js/sessions.min.js rename to lemonldap-ng-manager/site/htdocs/static/js/sessions.min.js diff --git a/lemonldap-ng-manager/site/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json similarity index 100% rename from lemonldap-ng-manager/site/static/languages/en.json rename to lemonldap-ng-manager/site/htdocs/static/languages/en.json diff --git a/lemonldap-ng-manager/site/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json similarity index 100% rename from lemonldap-ng-manager/site/static/languages/fr.json rename to lemonldap-ng-manager/site/htdocs/static/languages/fr.json diff --git a/lemonldap-ng-manager/site/static/logos/bootstrap.png b/lemonldap-ng-manager/site/htdocs/static/logos/bootstrap.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/bootstrap.png rename to lemonldap-ng-manager/site/htdocs/static/logos/bootstrap.png diff --git a/lemonldap-ng-manager/site/static/logos/custom.png b/lemonldap-ng-manager/site/htdocs/static/logos/custom.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/custom.png rename to lemonldap-ng-manager/site/htdocs/static/logos/custom.png diff --git a/lemonldap-ng-manager/site/static/logos/dark.png b/lemonldap-ng-manager/site/htdocs/static/logos/dark.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/dark.png rename to lemonldap-ng-manager/site/htdocs/static/logos/dark.png diff --git a/lemonldap-ng-manager/site/static/logos/en.png b/lemonldap-ng-manager/site/htdocs/static/logos/en.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/en.png rename to lemonldap-ng-manager/site/htdocs/static/logos/en.png diff --git a/lemonldap-ng-manager/site/static/logos/favicon.ico b/lemonldap-ng-manager/site/htdocs/static/logos/favicon.ico similarity index 100% rename from lemonldap-ng-manager/site/static/logos/favicon.ico rename to lemonldap-ng-manager/site/htdocs/static/logos/favicon.ico diff --git a/lemonldap-ng-manager/site/static/logos/fr.png b/lemonldap-ng-manager/site/htdocs/static/logos/fr.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/fr.png rename to lemonldap-ng-manager/site/htdocs/static/logos/fr.png diff --git a/lemonldap-ng-manager/site/static/logos/impact.png b/lemonldap-ng-manager/site/htdocs/static/logos/impact.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/impact.png rename to lemonldap-ng-manager/site/htdocs/static/logos/impact.png diff --git a/lemonldap-ng-manager/site/static/logos/llng-icon-32.png b/lemonldap-ng-manager/site/htdocs/static/logos/llng-icon-32.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/llng-icon-32.png rename to lemonldap-ng-manager/site/htdocs/static/logos/llng-icon-32.png diff --git a/lemonldap-ng-manager/site/static/logos/llng-logo-32.png b/lemonldap-ng-manager/site/htdocs/static/logos/llng-logo-32.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/llng-logo-32.png rename to lemonldap-ng-manager/site/htdocs/static/logos/llng-logo-32.png diff --git a/lemonldap-ng-manager/site/static/logos/pastel.png b/lemonldap-ng-manager/site/htdocs/static/logos/pastel.png similarity index 100% rename from lemonldap-ng-manager/site/static/logos/pastel.png rename to lemonldap-ng-manager/site/htdocs/static/logos/pastel.png diff --git a/lemonldap-ng-manager/site/static/reverseTree.json b/lemonldap-ng-manager/site/htdocs/static/reverseTree.json similarity index 100% rename from lemonldap-ng-manager/site/static/reverseTree.json rename to lemonldap-ng-manager/site/htdocs/static/reverseTree.json diff --git a/lemonldap-ng-manager/site/static/struct.json b/lemonldap-ng-manager/site/htdocs/static/struct.json similarity index 100% rename from lemonldap-ng-manager/site/static/struct.json rename to lemonldap-ng-manager/site/htdocs/static/struct.json diff --git a/lemonldap-ng-manager/t/03-HTML-forms.t b/lemonldap-ng-manager/t/03-HTML-forms.t index 8ee8efa67..35eab68cd 100644 --- a/lemonldap-ng-manager/t/03-HTML-forms.t +++ b/lemonldap-ng-manager/t/03-HTML-forms.t @@ -7,7 +7,7 @@ use Test::More; use strict; use Data::Dumper; -my $formDir = 'site/static/forms'; +my $formDir = 'site/htdocs/static/forms'; my $count = 0; use_ok('Lemonldap::NG::Manager::Build::Tree'); diff --git a/lemonldap-ng-manager/t/05-rest-api.t b/lemonldap-ng-manager/t/05-rest-api.t index 328ce2862..7e9f799c9 100644 --- a/lemonldap-ng-manager/t/05-rest-api.t +++ b/lemonldap-ng-manager/t/05-rest-api.t @@ -6,7 +6,7 @@ use JSON; use strict; require 't/test-lib.pm'; -my $struct = 'site/static/struct.json'; +my $struct = 'site/htdocs/static/struct.json'; my @bad = qw( /confs/1567 diff --git a/lemonldap-ng-manager/t/90-translations.t b/lemonldap-ng-manager/t/90-translations.t index 44a97f1f6..1493f3520 100644 --- a/lemonldap-ng-manager/t/90-translations.t +++ b/lemonldap-ng-manager/t/90-translations.t @@ -6,7 +6,7 @@ use Test::More; use JSON; use strict; -my $langDir = 'site/static/languages'; +my $langDir = 'site/htdocs/static/languages'; my $count = 0; use_ok('Lemonldap::NG::Manager::Build::Tree'); @@ -89,7 +89,7 @@ $count += 2; ok( open( F, -q#perl -ne 'print if(s/.*trspan="(\w+)".*/$1/g)' site/templates/manager.tpl site/static/forms/*|sort -u|# +q#perl -ne 'print if(s/.*trspan="(\w+)".*/$1/g)' site/templates/manager.tpl site/htdocs/static/forms/*|sort -u|# ), 'Find HTML docs' ); diff --git a/scripts/jsongenerator.pl b/scripts/jsongenerator.pl index b2560d0ea..10580f875 100755 --- a/scripts/jsongenerator.pl +++ b/scripts/jsongenerator.pl @@ -3,13 +3,13 @@ use Lemonldap::NG::Manager::Build; Lemonldap::NG::Manager::Build->run( - structFile => 'lemonldap-ng-manager/site/static/struct.json', - confTreeFile => 'lemonldap-ng-manager/site/static/js/conftree.js', + structFile => 'lemonldap-ng-manager/site/htdocs/static/struct.json', + confTreeFile => 'lemonldap-ng-manager/site/htdocs/static/js/conftree.js', managerConstantsFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm', managerAttributesFile => 'lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm', defaultValuesFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm', confConstantsFile => 'lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm', firstLmConfFile => '_example/conf/lmConf-1.json', - reverseTreeFile => 'lemonldap-ng-manager/site/static/reverseTree.json', + reverseTreeFile => 'lemonldap-ng-manager/site/htdocs/static/reverseTree.json', );