mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
79 lines
2.3 KiB
Diff
79 lines
2.3 KiB
Diff
--- a/sapi/fpm/fpm/fpm_conf.c
|
|
+++ b/sapi/fpm/fpm/fpm_conf.c
|
|
@@ -1307,7 +1307,7 @@
|
|
}
|
|
|
|
if (!fpm_global_config.error_log) {
|
|
- fpm_global_config.error_log = strdup("log/php-fpm.log");
|
|
+ fpm_global_config.error_log = strdup("log/php85/error.log");
|
|
}
|
|
|
|
#ifdef HAVE_SYSTEMD
|
|
@@ -1318,7 +1318,7 @@
|
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
if (!fpm_global_config.syslog_ident) {
|
|
- fpm_global_config.syslog_ident = strdup("php-fpm");
|
|
+ fpm_global_config.syslog_ident = strdup("php-fpm85");
|
|
}
|
|
|
|
if (fpm_global_config.syslog_facility < 0) {
|
|
@@ -1841,7 +1841,7 @@
|
|
if (fpm_globals.prefix == NULL) {
|
|
spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
|
|
} else {
|
|
- spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix);
|
|
+ spprintf(&tmp, 0, "%s/etc/php85/php-fpm.conf", fpm_globals.prefix);
|
|
}
|
|
|
|
if (!tmp) {
|
|
|
|
--- a/sapi/fpm/php-fpm.conf.in
|
|
+++ b/sapi/fpm/php-fpm.conf.in
|
|
@@ -16,3 +16,3 @@
|
|
; Default Value: none
|
|
-;pid = run/php-fpm.pid
|
|
+;pid = run/php-fpm85.pid
|
|
|
|
@@ -22,4 +22,4 @@
|
|
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
|
|
-; Default Value: log/php-fpm.log
|
|
-;error_log = log/php-fpm.log
|
|
+; Default Value: log/php85/error.log
|
|
+;error_log = log/php85/error.log
|
|
|
|
@@ -35,4 +35,4 @@
|
|
; which must suit common needs.
|
|
-; Default Value: php-fpm
|
|
-;syslog.ident = php-fpm
|
|
+; Default Value: php-fpm85
|
|
+;syslog.ident = php-fpm85
|
|
|
|
--- a/sapi/fpm/www.conf.in
|
|
+++ b/sapi/fpm/www.conf.in
|
|
@@ -292,7 +292,7 @@
|
|
|
|
; The access log file
|
|
; Default: not set
|
|
-;access.log = log/$pool.access.log
|
|
+;access.log = log/php85/$pool.access.log
|
|
|
|
; The access log format.
|
|
; The following syntax is allowed
|
|
@@ -372,7 +372,7 @@
|
|
; The log file for slow requests
|
|
; Default Value: not set
|
|
; Note: slowlog is mandatory if request_slowlog_timeout is set
|
|
-;slowlog = log/$pool.log.slow
|
|
+;slowlog = log/php85/$pool.slow.log
|
|
|
|
; The timeout for serving a single request after which a PHP backtrace will be
|
|
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
|
|
@@ -485,6 +485,6 @@
|
|
; specified at startup with the -d argument
|
|
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
|
|
;php_flag[display_errors] = off
|
|
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
|
|
+;php_admin_value[error_log] = /var/log/php85/$pool.error.log
|
|
;php_admin_flag[log_errors] = on
|
|
;php_admin_value[memory_limit] = 32M
|