hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-22 17:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3150-Make-optional-for-sync-admin-password

Browse Source
This commit is contained in:
Nicolas Maillat
2020-07-06 23:23:22 +02:00
committed by GitHub
parent 7e5f020703 e7b9544b44
commit 0a4a2bd3f1
13 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/phraseanet/entrypoint.sh
View File

@@ -58,7 +58,7 @@ chown -R app:app \
www
if [ -d "plugins/" ];then
chown -R app:app plugin;
chown -R app:app plugins;
fi
bash -e docker-php-entrypoint $@

4
docker/phraseanet/php.ini.sample
View File

@@ -380,7 +380,7 @@ expose_php = On
; Maximum execution time of each script, in seconds
; http://php.net/max-execution-time
; Note: This directive is hardcoded to 0 for the CLI SAPI
max_execution_time = 9999
max_execution_time = $MAX_EXECUTION_TIME
; Maximum amount of time each script may spend parsing request data. It's a good
; idea to limit this time on productions servers in order to eliminate unexpectedly
@@ -390,7 +390,7 @@ max_execution_time = 9999
; Development Value: 60 (60 seconds)
; Production Value: 60 (60 seconds)
; http://php.net/max-input-time
max_input_time = 60
max_input_time = $MAX_INPUT_TIME
; Maximum input variable nesting level
; http://php.net/max-input-nesting-level