Merge branch 'master' of https://git.oopen.de/install/php

mod_php_install.sh

@@ -242,7 +242,7 @@ fi
 # Default Settings apc extension
 #
 DEFAULT_APC_ENABLE_CLI=1
-DEFAULT_APC_SHM_SIZE="32M"
+DEFAULT_APC_SHM_SIZE="128M"
 DEFAULT_APC_STAT=1
 DEFAULT_APCU_STAT=1
 DEFAULT_APC_BY_DEFAULT=1
@@ -1048,12 +1048,8 @@ if $WITH_PHP_FPM_SUPPORT ; then
    DEFAULT_FPM_POOL_START_SERVER=15
    DEFAULT_FPM_POOL_MIN_SPARE=6
    DEFAULT_FPM_POOL_MAX_SPARE=24
-   DEFAULT_FPM_POOL_MAX_CHILDREN=256
-   if [[ -n "${APACHE_FCGID_MAX_REQUESTS_PER_PROCESS}" ]] ; then
-      DEFAULT_FPM_POOL_MAX_REQUESTS="${APACHE_FCGID_MAX_REQUESTS_PER_PROCESS}"
-   else
-      DEFAULT_FPM_POOL_MAX_REQUESTS=499
-   fi
+   DEFAULT_FPM_POOL_MAX_CHILDREN=60
+   DEFAULT_FPM_POOL_MAX_REQUESTS=5000
    DEFAULT_FPM_POOL_TERMINATE_TIMEOUT="$(expr $PROXY_TIMEOUT + 1)"
 
 
@@ -1239,21 +1235,23 @@ if $WITH_PHP_FPM_SUPPORT ; then
       fi
    done
 
-   FPM_POOL_MAX_CHILDREN=""
-   DEFAULT_FPM_POOL_MAX_CHILDREN=$(expr $FPM_POOL_MIN_SPARE + $DEFAULT_FPM_POOL_MAX_CHILDREN + 5)
-   while [[ "X$FPM_POOL_MAX_CHILDREN" = "X" ]]; do
-      echononl "pm.max_children: [$DEFAULT_FPM_POOL_MAX_CHILDREN] "
-      read FPM_POOL_MAX_CHILDREN
-      if [ "X$FPM_POOL_MAX_CHILDREN" = "X" ]; then
-         FPM_POOL_MAX_CHILDREN=$DEFAULT_FPM_POOL_MAX_CHILDREN
-         break
-      fi
-      if ! is_int $FPM_POOL_MAX_CHILDREN ; then
-         warn "Wrong value for pm.max_children was given (mus be an integer). Reenter again"
-         FPM_POOL_MAX_CHILDREN=""
-         continue
-      fi
-   done
+   FPM_POOL_MAX_CHILDREN="${DEFAULT_FPM_POOL_MAX_CHILDREN}"
+
+#   FPM_POOL_MAX_CHILDREN=""
+#   DEFAULT_FPM_POOL_MAX_CHILDREN=$(expr $FPM_POOL_MIN_SPARE + $DEFAULT_FPM_POOL_MAX_CHILDREN + 5)
+#   while [[ "X$FPM_POOL_MAX_CHILDREN" = "X" ]]; do
+#      echononl "pm.max_children: [$DEFAULT_FPM_POOL_MAX_CHILDREN] "
+#      read FPM_POOL_MAX_CHILDREN
+#      if [ "X$FPM_POOL_MAX_CHILDREN" = "X" ]; then
+#         FPM_POOL_MAX_CHILDREN=$DEFAULT_FPM_POOL_MAX_CHILDREN
+#         break
+#      fi
+#      if ! is_int $FPM_POOL_MAX_CHILDREN ; then
+#         warn "Wrong value for pm.max_children was given (mus be an integer). Reenter again"
+#         FPM_POOL_MAX_CHILDREN=""
+#         continue
+#      fi
+#   done
 
    FPM_POOL_TERMINATE_TIMEOUT=""
    while [[ "X$FPM_POOL_TERMINATE_TIMEOUT" = "X" ]]; do
@@ -7256,6 +7254,10 @@ rlimit_files = $FPM_ULIMIT_MAX_FILES
 ; Default Value: log/php-fpm.log
 error_log = $FPM_ERROR_LOG
 
+; Minimaler Log-Level fuer FPM-eigene Meldungen (Standard: notice).
+; Gueltige Werte: alert, error, warning, notice, debug
+log_level = warning
+
 include=etc/${FPM_POOL_CONF_DIR}/*.conf
 EOF