extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 16:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not working default session-timeout of 4h or custom one set with EGW_SESSION_TIMEOUT

Browse Source 
caused by Debian/Ubuntu session-cleanup-script does not understand whitespace before and after equal sign: session.gc_maxlifetime = N
This commit is contained in:
Ralf Becker 2019-11-19 15:15:18 +02:00
parent 93b1c7f1ab
commit 60965a57ec
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/docker/development/entrypoint.sh
View File

@ -5,7 +5,7 @@ VERSION=${VERSION:-dev-master}
# if EGW_SESSION_TIMEOUT is set in environment, propagate value to php.ini # if EGW_SESSION_TIMEOUT is set in environment, propagate value to php.ini
test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 && test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 &&
sed -e "s/^;\?session.gc_maxlifetime.*/session.gc_maxlifetime = $EGW_SESSION_TIMEOUT/g" \ sed -e "s/^;\?session.gc_maxlifetime.*/session.gc_maxlifetime=$EGW_SESSION_TIMEOUT/g" \
-i /etc/php/7.3/fpm/php.ini -i /etc/php/7.3/fpm/php.ini
# if XDEBUG_REMOTE_HOST is set, patch it into xdebug config # if XDEBUG_REMOTE_HOST is set, patch it into xdebug config

2
doc/docker/fpm/Dockerfile
View File

@ -23,7 +23,7 @@ RUN apt-get update \
-e 's/^;\?php_admin_value\[memory_limit\].*/php_admin_value[memory_limit] = 172M/' \ -e 's/^;\?php_admin_value\[memory_limit\].*/php_admin_value[memory_limit] = 172M/' \
-e 's/^;\?request_terminate_timeout.*/request_terminate_timeout = 70m/' \ -e 's/^;\?request_terminate_timeout.*/request_terminate_timeout = 70m/' \
-i /etc/php/7.3/fpm/pool.d/www.conf \ -i /etc/php/7.3/fpm/pool.d/www.conf \
&& sed -e 's/^;\?session.gc_maxlifetime.*/session.gc_maxlifetime = 14400/g' \ && sed -e 's/^;\?session.gc_maxlifetime.*/session.gc_maxlifetime=14400/g' \
-e 's|^;\?date.timezone.*|date.timezone = UTC|g' \ -e 's|^;\?date.timezone.*|date.timezone = UTC|g' \
-e 's|^;\?sys_temp_dir.*|sys_temp_dir = /tmp|g' \ -e 's|^;\?sys_temp_dir.*|sys_temp_dir = /tmp|g' \
-e 's|^;\?disable_functions.*|disable_functions = exec,passthru,shell_exec,system,proc_open,popen|g' \ -e 's|^;\?disable_functions.*|disable_functions = exec,passthru,shell_exec,system,proc_open,popen|g' \

2
doc/docker/fpm/entrypoint.sh
View File

@ -3,7 +3,7 @@ set -e
# if EGW_SESSION_TIMEOUT is set in environment, propagate value to php.ini # if EGW_SESSION_TIMEOUT is set in environment, propagate value to php.ini
test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 && test -n "$EGW_SESSION_TIMEOUT" && test "$EGW_SESSION_TIMEOUT" -ge 1440 &&
sed -e "s/^;\?session.gc_maxlifetime.*/session.gc_maxlifetime = $EGW_SESSION_TIMEOUT/g" \ sed -e "s/^;\?session.gc_maxlifetime.*/session.gc_maxlifetime=$EGW_SESSION_TIMEOUT/g" \
-i /etc/php/7.3/fpm/php.ini -i /etc/php/7.3/fpm/php.ini
# ToDo check version before copy # ToDo check version before copy