From 04c73c223b8b475d094ebc48d604589faec833a9 Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
Date: Wed, 14 Oct 2020 13:17:07 +0200
Subject: [PATCH] Don't crash if LemonLDAP::NG is disabled

Ref: #30852
---
 diagnose/71-lemonLDAP       |  3 ++-
 postservice/99-lemonldap-ng |  9 +++------
 posttemplate/70-lemon-nginx | 24 +++++++++++++-----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/diagnose/71-lemonLDAP b/diagnose/71-lemonLDAP
index f072546..f885a00 100755
--- a/diagnose/71-lemonLDAP
+++ b/diagnose/71-lemonLDAP
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-if [ $(CreoleGet activerLemon) = "oui" ];then
+if [ $(CreoleGet activerLemon 'non') = 'oui' ]
+then
     . /usr/lib/eole/diagnose.sh
     manager=$(CreoleGet managerWebName)
     portal=$(CreoleGet authWebName)
diff --git a/postservice/99-lemonldap-ng b/postservice/99-lemonldap-ng
index 3f66c97..022cef8 100644
--- a/postservice/99-lemonldap-ng
+++ b/postservice/99-lemonldap-ng
@@ -1,9 +1,6 @@
 #!/bin/bash
 
+[ "$(CreoleGet activerLemon non)" = 'oui' ] || exit 0
+
 # Updating Configuration cache
-
-cmd="/usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache"
-opt="update-cache"
-
-res=$(${cmd} ${opt} 2>&1)
-exit ${?}
+/usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache 2>&1
diff --git a/posttemplate/70-lemon-nginx b/posttemplate/70-lemon-nginx
index 6b32fa8..43586a0 100755
--- a/posttemplate/70-lemon-nginx
+++ b/posttemplate/70-lemon-nginx
@@ -1,17 +1,19 @@
 #!/bin/bash
 
 ENABLE=$(CreoleGet activerLemon 'non')
-CONF_FILES="manager-nginx.conf"
-CONF_FILES="${CONF_FILES} handler-nginx.conf"
-CONF_FILES="${CONF_FILES} portal-nginx.conf"
-CONF_FILES="${CONF_FILES} test-nginx.conf"
+NGINX_ENABLE=$(CreoleGet activer_nginx_web 'non')
+
+CONF_FILES="manager-nginx.conf handler-nginx.conf portal-nginx.conf"
 
 for CONF_FILE in ${CONF_FILES}
 do
-   if [ -L /etc/nginx/sites-enabled/${CONF_FILE} ];then
-       rm /etc/nginx/sites-enabled/${CONF_FILE}
-   fi
-   if [ "${ENABLE}" = 'oui' ];then
-       ln -s /etc/nginx/sites-available/${CONF_FILE} /etc/nginx/sites-enabled/${CONF_FILE}
-   fi
-done
\ No newline at end of file
+    if [ -e /etc/nginx/sites-enabled/${CONF_FILE} ]
+    then
+        rm /etc/nginx/sites-enabled/${CONF_FILE}
+    fi
+
+    if [ "${ENABLE}" = 'oui' -a "${NGINX_ENABLE}" = 'oui' ]
+    then
+        ln -s /etc/nginx/sites-available/${CONF_FILE} /etc/nginx/sites-enabled/${CONF_FILE}
+    fi
+done