Merge branch 'master' into dist/eole/2.7.2/master

Merge branch '2.8.0/master'
Updating nginx configuration for 2.8
2020-12-09 17:56:17 +01:00 · 2020-12-09 17:17:56 +01:00 · 2020-12-09 17:17:30 +01:00 · 2020-12-09 16:48:35 +01:00 · 2020-12-09 16:48:14 +01:00 · 2020-12-09 10:33:04 +01:00
9 changed files with 29 additions and 24 deletions
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+10
--- a/debian/control
+++ b/debian/control
@ -1,16 +1,16 @@
-Source: eole-lemonldap-ng
+Source: eole-lemonldap
 Section: web
 Priority: optional
 Maintainer: Équipe EOLE <eole@ac-dijon.fr>
-Build-Depends: debhelper-compat (= 12)
-Standards-Version: 4.5.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
 Homepage: https://dev-eole.ac-dijon.fr/projects/sso
 Vcs-Git: https://dev-eole.ac-dijon.fr/git/eole-lemonldap-ng.git
 Vcs-Browser: https://dev-eole.ac-dijon.fr/projects/sso/repository

-Package: eole-lemonldap-ng
+Package: eole-lemonldap
 Architecture: all
-Depends: eole-lemonldap-ng-pkg,
+Depends: eole-lemonldap-pkg,
         ${misc:Depends}
 Description: Dictionnaires et templates pour la configuration d'un serveur LemonLDAP::NG
 Pour toute information complémentaire, veuillez vous rendre sur le
@ -19,7 +19,7 @@ Description: Dictionnaires et templates pour la configuration d'un serveur Lemon
 Package: eole-lemonldap-ng-scribe
 Architecture: all
 Depends: eole-scribe,
-         eole-lemonldap-ng,
+         eole-lemonldap,
 	 libapache2-mod-perl2,
         ${misc:Depends}
 Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
@ -27,7 +27,7 @@ Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
 Pour toute information complémentaire, veuillez vous rendre sur le
 site du projet EOLE.

-Package: eole-lemonldap-ng-pkg
+Package: eole-lemonldap-pkg
 Architecture: all
 Section: metapackages
 Depends: lemonldap-ng,
--- a/debian/copyright
+++ b/debian/copyright
@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: eole-lemonldap-ng
-Source: http://dev-eole.ac-dijon.fr/projects/sso
+Upstream-Name: {PROJECT}
+Source: ${URL}

 Files: *
 Copyright: 2020 Équipe EOLE <eole@ac-dijon.fr>
--- a/debian/eole-lemonldap.install
+++ b/debian/eole-lemonldap.install
@ -0,0 +1,6 @@
+usr/share/creole/
+usr/share/eole/creole/dicos/70_lemonldap_ng.xml
+usr/share/eole/creole/distrib/
+usr/share/eole/diagnose/
+usr/share/eole/postservice/99-lemonldap-ng
+usr/share/eole/posttemplate/
--- a/debian/rules
+++ b/debian/rules
@ -2,8 +2,8 @@
 # -*- makefile -*-

 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_VERBOSE=1
+#export DH_OPTIONS=-v

 %:
 	dh $@
--- a/dicos/70_lemonldap_ng.xml
+++ b/dicos/70_lemonldap_ng.xml
@ -9,6 +9,7 @@
        <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/manager-nginx.conf' mkdir='True' rm='True'/>
        <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/handler-nginx.conf' mkdir='True' rm='True'/>
        <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/portal-nginx.conf' mkdir='True' rm='True'/>
+        <file filelist='lemonldap-nginx' name='/etc/lemonldap-ng/nginx-lmlog.conf' mkdir='True' rm='True'/>

        <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/manager-apache2.X.conf' mkdir='True' rm='True'/>
        <file filelist='lemonldap-apache' name='/etc/lemonldap-ng/handler-apache2.X.conf' mkdir='True' rm='True'/>
--- a/tmpl/handler-nginx.conf
+++ b/tmpl/handler-nginx.conf
@ -23,8 +23,7 @@ server {
 }

 server {
-  listen 443;
-  ssl on;
+  listen 443 ssl;
 %if %%cert_type == "letsencrypt"
  ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
  ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@ -62,7 +61,7 @@ server {
    deny all;

    # Uncomment this if you use https only
-    #add_header Strict-Transport-Security "max-age=15768000";
+    add_header Strict-Transport-Security "max-age=15768000";
  }

 }
--- a/tmpl/manager-nginx.conf
+++ b/tmpl/manager-nginx.conf
@ -5,8 +5,7 @@ server {
 }

 server {
-  listen 443;
-  ssl on;
+  listen 443 ssl;
  %if %%cert_type == "letsencrypt"
  ssl_certificate %%le_config_dir/live/%%managerWebName/cert.pem;
  ssl_certificate_key %%le_config_dir/live/%%managerWebName/privkey.pem;
@ -70,8 +69,8 @@ server {

  # DEBIAN
  # If install was made with USEDEBIANLIBS (official releases), uncomment this
-  #location /javascript/ {
-  #  alias /usr/share/javascript/;
-  #}
+  location /javascript/ {
+    alias /usr/share/javascript/;
+  }

 }
--- a/tmpl/portal-nginx.conf
+++ b/tmpl/portal-nginx.conf
@ -15,8 +15,7 @@ server {
 }

 server {
-  listen 443;
-  ssl on;
+  listen 443 ssl;
 %if %%cert_type == "letsencrypt"
  ssl_certificate %%le_config_dir/live/%%authWebName/cert.pem;
  ssl_certificate_key %%le_config_dir/live/%%authWebName/privkey.pem;
@ -83,7 +82,7 @@ server {

  # DEBIAN
  # If install was made with USEDEBIANLIBS (official releases), uncomment this
-  #location /javascript/ {
-  #  alias /usr/share/javascript/;
-  #}
+  location /javascript/ {
+    alias /usr/share/javascript/;
+  }
 }
Author	SHA1	Message	Date
Philippe Caseiro	65f53a45b6	Merge branch 'master' into dist/eole/2.7.2/master	2020-12-09 17:56:17 +01:00
Philippe Caseiro	140cc084a3	Merge branch '2.8.0/master'	2020-12-09 17:17:56 +01:00
Philippe Caseiro	3753625b20	Updating nginx configuration for 2.8	2020-12-09 17:17:30 +01:00
Philippe Caseiro	df5dabbcf4	Merge branch '2.8.0/master'	2020-12-09 16:48:35 +01:00
Philippe Caseiro	47e822f9b9	Updating lmlog file for nginx mode	2020-12-09 16:48:14 +01:00
Philippe Caseiro	de5ce3b797	Adding compat file	2020-12-09 10:33:04 +01:00
Philippe Caseiro	9687572302	Try to fix packaging	2020-12-09 10:17:34 +01:00
Philippe Caseiro	3ea07a6ea2	Fix copyright	2020-12-09 10:03:25 +01:00
Philippe Caseiro	771247ef0a	Fix depends	2020-12-09 09:51:25 +01:00
Philippe Caseiro	87818bd6f0	Activer la possibilité de changer son mot de passe depuis LemonLDAP ref #31347	2020-12-07 16:07:34 +01:00
Philippe Caseiro	bf94e74916	Using Active Directory (samba4) instead of OpenLDAP Moving to Active Directory the actual auth LDAP server The password is updated in the Samba4 directory so we need to use this one and not the OpenLDAP one	2020-12-03 16:50:55 +01:00
Philippe Caseiro	0f3ff07b5f	Merge last evolutions from master branch	2020-12-02 10:20:42 +01:00
Philippe Caseiro	74fb92fb55	Make eole-lemonldap-ng compatible with eolebase	2020-11-24 15:51:43 +01:00