Merge branch 'staging' into dist/eole/2.6.2/staging

Replace header with nicer values

README.md

@@ -12,8 +12,8 @@ GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
 
 #### LemonLDAP::NG repository
  
-* deb     https://lemonldap-ng.org/deb stable main
+* deb     https://lemonldap-ng.org/deb 1.9 main
-* deb-src https://lemonldap-ng.org/deb stable main
+* deb-src https://lemonldap-ng.org/deb 1.9 main
 * Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2 
 
 #### Cadoles Repository

debian/control

@@ -10,16 +10,21 @@ Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-lemonldap
 
 Package: eole-lemonldap
 Architecture: all
-Depends: ${misc:Depends}, lemonldap-ng, lemonldap-ng-doc, lemonldap-ng-fastcgi-server,
+Depends: ${misc:Depends}, eole-lemonldap-pkg
-   libxml-libxml-perl, libxml-libxslt-perl, libcgi-emulate-psgi-perl, libauthen-captcha-perl, liblasso-perl,
-   libxml-simple-perl, libcgi-compile-perl, libmouse-perl,
-   libio-string-perl,
-   libnet-openid-server-perl,
-   libemail-sender-perl,
-   libgd-securityimage-perl,
-   libimage-magick-perl
 Conflicts: eole-sso
 Provides: eole-sso
 Description: Dictionnaires et templates pour la configuration d'un serveur LemonLDAP::NG, testée uniquement avec eolebase
  .
  Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.
+
+Package: eole-lemonldap-pkg
+Architecture: all
+Depends: ${misc:Depends}, lemonldap-ng, lemonldap-ng-doc, lemonldap-ng-fastcgi-server,
+   libxml-libxml-perl, libxml-libxslt-perl, libcgi-emulate-psgi-perl, libauthen-captcha-perl, liblasso-perl,
+   libxml-simple-perl, libcgi-compile-perl, libmouse-perl, libio-string-perl, libnet-openid-server-perl,
+   libemail-sender-perl, libgd-securityimage-perl, libimage-magick-perl, libnet-ldap-perl,
+   libunicode-string-perl, libsoap-lite-perl, libhtml-template-perl, libcache-cache-perl,
+   libdbi-perl, perl-modules, libwww-perl
+Description: Paquet de dépendances pour eole-lemonldap.
+ .
+ Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

debian/eole-lemonldap.install

@@ -0,0 +1 @@
+usr

tmpl/portal-nginx.conf

@@ -4,6 +4,7 @@
 #  default           "";
 #  ~/CN=(?<CN>[^/]+) $CN;
 #}
+%set %%webDomain = %%authWebName.split('.',1)[1]
 
 server {
   listen 80;
@@ -40,6 +41,8 @@ server {
     fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     fastcgi_split_path_info ^(.*\.psgi)(/.*)$;
     fastcgi_param PATH_INFO  $fastcgi_path_info;
+    fastcgi_hide_header Content-Security-Policy;
+    add_header Content-Security-Policy "default-src 'self'; form-action 'self' http://*.%%webDomain https://*.%%webDomain; object-src 'none'";
 
   }