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

Merge branch 'staging' into dist/eole/2.6.2/staging
Merge branch 'develop'
2019-09-13 11:21:42 +02:00 · 2019-09-13 10:05:59 +02:00 · 2019-09-13 10:00:17 +02:00 · 2019-07-11 09:44:49 +02:00
2 changed files with 2 additions and 5 deletions
--- a/README.md
+++ b/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-src https://lemonldap-ng.org/deb stable main
+* deb     https://lemonldap-ng.org/deb 1.9 main
+* deb-src https://lemonldap-ng.org/deb 1.9 main
 * Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2 

 #### Cadoles Repository
--- a/tmpl/portal-nginx.conf
+++ b/tmpl/portal-nginx.conf
@ -4,7 +4,6 @@
 #  default           "";
 #  ~/CN=(?<CN>[^/]+) $CN;
 #}
-%set %%webDomain = %%authWebName.split('.',1)[1]

 server {
  listen 80;
@ -41,8 +40,6 @@ 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'";

  }
Author	SHA1	Message	Date
Philippe Caseiro	148b0b87f1	Merge branch 'dist/eole/2.6.2/develop' into dist/eole/2.6.2/staging	2019-09-13 11:21:42 +02:00
Philippe Caseiro	e1f90ef9fd	Merge branch 'staging' into dist/eole/2.6.2/staging	2019-09-13 10:05:59 +02:00
Philippe Caseiro	a96d56b19c	Merge branch 'develop'	2019-09-13 10:00:17 +02:00
Philippe Caseiro	c7b38c52d0	Update README	2019-07-11 09:44:49 +02:00