3.0.0pre

Author: tiredofit

rootfs/container/defaults/20-llng

@@ -27,18 +27,32 @@ DEFAULT_SOCKET_TCP_HOST=${DEFAULT_SOCKET_TCP_HOST:-"127.0.0.1"}
 DEFAULT_SOCKET_TCP_PORT=${DEFAULT_SOCKET_TCP_PORT:-"2884"}
 DEFAULT_SOCKET_TYPE=${DEFAULT_SOCKET_TYPE:-"tcp"}
 ENABLE_FAIL2BAN=${ENABLE_FAIL2BAN:-"FALSE"}
+HANDLER_ENABLE_NGINX=${HANDLER_ENABLE_NGINX:-"TRUE"}
+HANDLER_LISTEN_SOCKET_PATH=${HANDLER_LISTEN_SOCKET_PATH:-"${DEFAULT_SOCKET_PATH}"}
+HANDLER_LISTEN_SOCKET_TCP_PORT=${HANDLER_LISTEN_SOCKET_TCP_PORT:-"${DEFAULT_SOCKET_TCP_PORT}"}
+HANDLER_PROCESSES=${HANDLER_PROCESSES:-"1"}
+HANDLER_REDIRECT_ON_ERROR=${HANDLER_REDIRECT_ON_ERROR:-"TRUE"}
+HANDLER_SESSIONS_ACTIVE_FILE_PATH=${HANDLER_SESSIONS_ACTIVE_FILE_PATH:-"${INSTANCE_SESSIONS_ACTIVE_FILE_PATH}"}
+HANDLER_SESSIONS_ACTIVE_TYPE=${HANDLER_SESSIONS_ACTIVE_TYPE:-"NONE"}
 HANDLER_SESSIONS_CACHE_FILE_DEPTH=${HANDLER_SESSIONS_CACHE_FILE_DEPTH:-"${INSTANCE_SESSIONS_CACHE_FILE_DEPTH}"}
 HANDLER_SESSIONS_CACHE_FILE_DIR_MASK=${HANDLER_SESSIONS_CACHE_FILE_DIR_MASK:-"${INSTANCE_SESSIONS_CACHE_FILE_DIR_MASK}"}
 HANDLER_SESSIONS_CACHE_FILE_EXPIRY=${HANDLER_SESSIONS_CACHE_FILE_EXPIRY:-"${INSTANCE_SESSIONS_CACHE_FILE_EXPIRY}"}
 HANDLER_SESSIONS_CACHE_FILE_NAMESPACE=${HANDLER_SESSIONS_CACHE_FILE_NAMESPACE:-"${INSTANCE_SESSIONS_CACHE_FILE_NAMESPACE}"}
 HANDLER_SESSIONS_CACHE_FILE_PATH=${HANDLER_SESSIONS_CACHE_FILE_PATH:-"${INSTANCE_SESSIONS_CACHE_FILE_PATH}"}
 HANDLER_SESSIONS_CACHE_TYPE=${HANDLER_SESSIONS_CACHE_TYPE:-"NONE"}
-HANDLER_ENABLE_NGINX=${HANDLER_ENABLE_NGINX:-"TRUE"}
-HANDLER_LISTEN_SOCKET_PATH=${HANDLER_LISTEN_SOCKET_PATH:-"${DEFAULT_SOCKET_PATH}"}
-HANDLER_LISTEN_SOCKET_TCP_PORT=${HANDLER_LISTEN_SOCKET_TCP_PORT:-"${DEFAULT_SOCKET_TCP_PORT}"}
-HANDLER_PROCESSES=${HANDLER_PROCESSES:-"1"}
-HANDLER_REDIRECT_ON_ERROR=${HANDLER_REDIRECT_ON_ERROR:-"TRUE"}
+HANDLER_SESSIONS_PERSISTENT_FILE_PATH=${HANDLER_SESSIONS_PERSISTENT_FILE_PATH:-"${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH}"}
+HANDLER_SESSIONS_PERSISTENT_TYPE=${HANDLER_SESSIONS_PERSISTENT_TYPE:-"NONE"}
 HANDLER_STATUS=${HANDLER_STATUS:-"TRUE"}
+INSTANCE_SESSIONS_ACTIVE_FILE_PATH=${INSTANCE_SESSIONS_ACTIVE_FILE_PATH:-"${DATA_PATH%/}/sessions/active"}
+INSTANCE_SESSIONS_ACTIVE_TYPE=${INSTANCE_SESSIONS_ACTIVE_TYPE:-"FILE"}
+INSTANCE_SESSIONS_CACHE_FILE_DEPTH=${INSTANCE_SESSIONS_CACHE_FILE_DEPTH:-"3"}
+INSTANCE_SESSIONS_CACHE_FILE_DIR_MASK=${INSTANCE_SESSIONS_CACHE_FILE_DIR_MASK:-"007"}
+INSTANCE_SESSIONS_CACHE_FILE_EXPIRY=${INSTANCE_SESSIONS_CACHE_FILE_EXPIRY:-"600"}
+INSTANCE_SESSIONS_CACHE_FILE_NAMESPACE=${INSTANCE_SESSIONS_CACHE_FILE_NAMESPACE:-"sessions"}
+INSTANCE_SESSIONS_CACHE_FILE_PATH=${INSTANCE_SESSIONS_CACHE_FILE_PATH:-"/cache/"}
+INSTANCE_SESSIONS_CACHE_TYPE=${INSTANCE_SESSIONS_CACHE_TYPE:-"FILE"}
+INSTANCE_SESSIONS_PERSISTENT_FILE_PATH=${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH:-"${DATA_PATH%/}/sessions/persistent"}
+INSTANCE_SESSIONS_PERSISTENT_TYPE=${INSTANCE_SESSIONS_PERSISTENT_TYPE:-"FILE"}
 LOG_FILE=${LOG_FILE:-"lemonldap.log"}
 LOG_LEVEL=${LOG_LEVEL:-"notice"}
 LOG_PATH=${LOG_PATH:-"/logs/lemonldap/"}
@@ -73,26 +87,10 @@ PORTAL_NOTIFICATIONS_TYPE=${PORTAL_NOTIFICATIONS_TYPE:-"FILE"}
 PORTAL_NOTIFICATIONS_TYPE_FILE_PATH=${PORTAL_NOTIFICATIONS_TYPE_FILE_PATH:-"${DATA_PATH%/}/notifications"}
 PORTAL_NOTIFICATIONS_TYPE_FILE_SEPERATOR=${PORTAL_NOTIFICATIONS_TYPE_FILE_SEPERATOR:-"_"}
 PORTAL_REST_AUTH_FILE=${PORTAL_REST_AUTH_FILE:-"${DATA_PATH}/portal-rest.htpasswd"}
-INSTANCE_SESSIONS_ACTIVE_FILE_PATH=${INSTANCE_SESSIONS_ACTIVE_FILE_PATH:-"${DATA_PATH%/}/sessions/active"}
-INSTANCE_SESSIONS_ACTIVE_TYPE=${INSTANCE_SESSIONS_ACTIVE_TYPE:-"FILE"}
-INSTANCE_SESSIONS_PERSISTENT_FILE_PATH=${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH:-"${DATA_PATH%/}/sessions/persistent"}
-INSTANCE_SESSIONS_PERSISTENT_TYPE=${INSTANCE_SESSIONS_PERSISTENT_TYPE:-"FILE"}
-
-INSTANCE_SESSIONS_CACHE_FILE_DEPTH=${INSTANCE_SESSIONS_CACHE_FILE_DEPTH:-"3"}
-INSTANCE_SESSIONS_CACHE_FILE_DIR_MASK=${INSTANCE_SESSIONS_CACHE_FILE_DIR_MASK:-"007"}
-INSTANCE_SESSIONS_CACHE_FILE_EXPIRY=${INSTANCE_SESSIONS_CACHE_FILE_EXPIRY:-"600"}
-INSTANCE_SESSIONS_CACHE_FILE_NAMESPACE=${INSTANCE_SESSIONS_CACHE_FILE_NAMESPACE:-"sessions"}
-INSTANCE_SESSIONS_CACHE_FILE_PATH=${INSTANCE_SESSIONS_CACHE_FILE_PATH:-"/cache/"}
-INSTANCE_SESSIONS_CACHE_TYPE=${INSTANCE_SESSIONS_CACHE_TYPE:-"FILE"}
-
 PORTAL_SESSIONS_ACTIVE_FILE_PATH=${PORTAL_SESSIONS_ACTIVE_FILE_PATH:-"${INSTANCE_SESSIONS_ACTIVE_FILE_PATH}"}
 PORTAL_SESSIONS_ACTIVE_TYPE=${PORTAL_SESSIONS_ACTIVE_TYPE:-"NONE"}
 PORTAL_SESSIONS_PERSISTENT_FILE_PATH=${PORTAL_SESSIONS_PERSISTENT_FILE_PATH:-"${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH}"}
 PORTAL_SESSIONS_PERSISTENT_TYPE=${PORTAL_SESSIONS_PERSISTENT_TYPE:-"NONE"}
-HANDLER_SESSIONS_ACTIVE_FILE_PATH=${HANDLER_SESSIONS_ACTIVE_FILE_PATH:-"${INSTANCE_SESSIONS_ACTIVE_FILE_PATH}"}
-HANDLER_SESSIONS_ACTIVE_TYPE=${HANDLER_SESSIONS_ACTIVE_TYPE:-"NONE"}
-HANDLER_SESSIONS_PERSISTENT_FILE_PATH=${HANDLER_SESSIONS_PERSISTENT_FILE_PATH:-"${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH}"}
-HANDLER_SESSIONS_PERSISTENT_TYPE=${HANDLER_SESSIONS_PERSISTENT_TYPE:-"NONE"}
 PORTAL_STATIC_PATH=${PORTAL_STATIC_PATH:-"/usr/share/lemonldap-ng/portal/static"}
 PORTAL_STATIC_PREFIX=${PORTAL_STATIC_PREFIX:-"/static"}
 PORTAL_TEMPLATES_PATH=${PORTAL_TEMPLATES_PATH:-"/usr/share/lemonldap-ng/portal/templates"}