3.0.0pre

Author: tiredofit

Containerfile

@@ -318,7 +318,8 @@ RUN echo "" && \
                     static/languages \
                     static/common/logos \
                     templates/bootstrap \
-                    templates/common; do \
+                    templates/common \
+                ; do \
         echo "${LEMONLDAP_VERSION} $(TZ=${TIMEZONE} date +'%Y-%m-%dT%H:%M:%S %Z') " > /container/data/llng/assets/portal/${asset}/.source; \
     done && \
     \

rootfs/container/defaults/20-llng

@@ -74,7 +74,7 @@ MODE=${MODE:-"AIO"}
 PORTAL_APPS_PATH=${PORTAL_APPS_PATH:-"/usr/share/lemonldap-ng/portal/static/common/apps"}
 PORTAL_CAPTCHA_PATH=${PORTAL_CAPTCHA_PATH:-"${DATA_PATH}/captcha"}
 PORTAL_ENABLE_GITLAB_OAUTH=${PORTAL_ENABLE_GITLAB_OAUTH:-"FALSE"}
-PORTAL_ENABLE_NOTIFICATIONS=${PORTAL_ENABLE_NOTIFICATIONS:-"TRUE"}
+#PORTAL_ENABLE_NOTIFICATIONS=${PORTAL_ENABLE_NOTIFICATIONS:-"TRUE"}
 PORTAL_ENABLE_REST=${PORTAL_ENABLE_REST:-"FALSE"}
 PORTAL_ICONS_PATH=${PORTAL_ICONS_PATH:-"/usr/share/lemonldap-ng/portal/static/common/icons"}
 PORTAL_LANGUAGE=${PORTAL_LANGUAGE:-"en"}

rootfs/container/functions/20-llng

@@ -240,15 +240,15 @@ llng_configure_handler() {
 
 llng_configure_instance() {
     print_debug "Configuring Logging"
-    local all_lines=(
+    local instance_lines=(
         "logLevel    = ${LOG_LEVEL}"
         "logger      = $(llng_logtype "${LOG_TYPE}")"
         "userLogger  = $(llng_logtype "${LOG_TYPE}")"
         "checkTime   = ${CONFIG_CHECK_INTERVAL}"
     )
 
-    var_true "${CONFIG_USE_SAFE_JAIL}"          && all_lines+=("useSafeJail = 1")
-    var_true "${CONFIG_ENABLE_CROSS_DOMAIN}"    && all_lines+=("cda         = 1")
+    var_true "${CONFIG_USE_SAFE_JAIL}"          && instance_lines+=("useSafeJail = 1")
+    var_true "${CONFIG_ENABLE_CROSS_DOMAIN}"    && instance_lines+=("cda         = 1")
 
     case "${INSTANCE_SESSIONS_ACTIVE_TYPE,,}" in
         "file" )
@@ -293,7 +293,7 @@ llng_configure_instance() {
         ;;
     esac
 
-    config_all=$(printf "%s\n" "${all_lines[@]}")
+    config_all=$(printf "%s\n" "${instance_lines[@]}")
 }
 
 llng_configure_instance_global_configuration() {