mirror of https://github.com/MISP/misp-docker
Fix bugs and defaults
parent
9381b463d0
commit
9bb03eab0a
|
@ -51,6 +51,11 @@ export PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE:-50M}
|
|||
export PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE:-50M}
|
||||
export PHP_MAX_INPUT_TIME=${PHP_MAX_INPUT_TIME:-300}
|
||||
|
||||
export PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN:-5}
|
||||
export PHP_FCGI_START_SERVERS=${PHP_FCGI_START_SERVERS:-2}
|
||||
export PHP_FCGI_SPARE_SERVERS=${PHP_FCGI_SPARE_SERVERS:-1}
|
||||
export PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS:-0}
|
||||
|
||||
export PHP_SESSION_TIMEOUT=${PHP_SESSION_TIMEOUT:-60}
|
||||
export PHP_SESSION_COOKIE_TIMEOUT=${PHP_SESSION_COOKIE_TIMEOUT:-10080}
|
||||
export PHP_SESSION_DEFAULTS=${PHP_SESSION_DEFAULTS:-php}
|
||||
|
|
|
@ -343,7 +343,7 @@ init_nginx() {
|
|||
if [[ "$FASTCGI_STATUS_LISTEN" != "" ]]; then
|
||||
echo "... enabling php-fpm status page"
|
||||
ln -s /etc/nginx/sites-available/php-fpm-status /etc/nginx/sites-enabled/php-fpm-status
|
||||
sed -i -E "s/ listen [^;]+/ listen $FASTCGI_STATUS_LISTEN" /etc/nginx/sites-enabled/php-fpm-status
|
||||
sed -i -E "s/ listen [^;]+/ listen $FASTCGI_STATUS_LISTEN/" /etc/nginx/sites-enabled/php-fpm-status
|
||||
elif [[ -f /etc/nginx/sites-enabled/php-fpm-status ]]; then
|
||||
echo "... disabling php-fpm status page"
|
||||
rm /etc/nginx/sites-enabled/php-fpm-status
|
||||
|
|
|
@ -194,12 +194,18 @@ services:
|
|||
- "FASTCGI_READ_TIMEOUT=${FASTCGI_READ_TIMEOUT:-300s}"
|
||||
- "FASTCGI_SEND_TIMEOUT=${FASTCGI_SEND_TIMEOUT:-300s}"
|
||||
- "FASTCGI_CONNECT_TIMEOUT=${FASTCGI_CONNECT_TIMEOUT:-300s}"
|
||||
- "FASTCGI_STATUS_LISTEN=${FASTCGI_STATUS_LISTEN}"
|
||||
# PHP settings
|
||||
- "PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-2048M}"
|
||||
- "PHP_MAX_EXECUTION_TIME=${PHP_MAX_EXECUTION_TIME:-300}"
|
||||
- "PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE:-50M}"
|
||||
- "PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE:-50M}"
|
||||
- "PHP_MAX_INPUT_TIME:${PHP_MAX_INPUT_TIME:-300}"
|
||||
# PHP FPM pool setup
|
||||
- "PHP_FCGI_CHILDREN=${PHP_FCGI_CHILDREN:-5}"
|
||||
- "PHP_FCGI_START_SERVERS=${PHP_FCGI_START_SERVERS:-2}"
|
||||
- "PHP_FCGI_SPARE_SERVERS=${PHP_FCGI_SPARE_SERVERS:-1}"
|
||||
- "PHP_FCGI_MAX_REQUESTS=${PHP_FCGI_MAX_REQUESTS:-0}"
|
||||
# Additional PHP settings
|
||||
- "PHP_SESSION_TIMEOUT=${PHP_SESSION_TIMEOUT:-60}"
|
||||
- "PHP_SESSION_COOKIE_TIMEOUT=${PHP_SESSION_COOKIE_TIMEOUT:-10080}"
|
||||
|
|
11
template.env
11
template.env
|
@ -183,7 +183,7 @@ SYNCSERVERS_1_PULL_RULES=
|
|||
# FASTCGI_READ_TIMEOUT=300s
|
||||
# FASTCGI_SEND_TIMEOUT=300s
|
||||
# FASTCGI_CONNECT_TIMEOUT=300s
|
||||
# Whete to listen to PHP-FPM status. Can be a port or a ip:port. If not set the status page will not be shown.
|
||||
# Where to listen to PHP-FPM status. Can be a port or a ip:port. If not set the status page will not be shown.
|
||||
# Do not expose this page in public networks.
|
||||
# FASTCGI_STATUS_LISTEN=""
|
||||
|
||||
|
@ -203,14 +203,13 @@ SYNCSERVERS_1_PULL_RULES=
|
|||
|
||||
## PHP FPM pool setup
|
||||
# Maximum number of php-fpm processes, limits the number of simultaneous requests.
|
||||
PHP_FCGI_CHILDREN="5"
|
||||
# PHP_FCGI_CHILDREN=5
|
||||
# Number of processes created on startup.
|
||||
PHP_FCGI_START_SERVERS="2"
|
||||
# PHP_FCGI_START_SERVERS=2
|
||||
# The desired number of idle server processes.
|
||||
PHP_FCGI_SPARE_SERVERS="1"
|
||||
# PHP_FCGI_SPARE_SERVERS=1
|
||||
# The number of requests each process should execute before respawning. "0" means endless request processing.
|
||||
PHP_FCGI_MAX_REQUESTS="0"
|
||||
|
||||
# PHP_FCGI_MAX_REQUESTS=0
|
||||
|
||||
## Additional PHP settings
|
||||
# Timeout (in minutes) for user session inactivity before it expires.
|
||||
|
|
Loading…
Reference in New Issue