projects/aports·blob master · refs

79 lines · 2.3 KiB

1--- a/sapi/fpm/fpm/fpm_conf.c
2+++ b/sapi/fpm/fpm/fpm_conf.c
3@@ -1307,7 +1307,7 @@
4 }
5
6 if (!fpm_global_config.error_log) {
7- fpm_global_config.error_log = strdup("log/php-fpm.log");
8+ fpm_global_config.error_log = strdup("log/php86/error.log");
9 }
10
11 #ifdef HAVE_SYSTEMD
12@@ -1318,7 +1318,7 @@
13
14 #ifdef HAVE_SYSLOG_H
15 if (!fpm_global_config.syslog_ident) {
16- fpm_global_config.syslog_ident = strdup("php-fpm");
17+ fpm_global_config.syslog_ident = strdup("php-fpm86");
18 }
19
20 if (fpm_global_config.syslog_facility < 0) {
21@@ -1836,7 +1836,7 @@
22 if (fpm_globals.prefix == NULL) {
23 spprintf(&tmp, 0, "%s/php-fpm.conf", PHP_SYSCONFDIR);
24 } else {
25- spprintf(&tmp, 0, "%s/etc/php-fpm.conf", fpm_globals.prefix);
26+ spprintf(&tmp, 0, "%s/etc/php86/php-fpm.conf", fpm_globals.prefix);
27 }
28
29 if (!tmp) {
30
31--- a/sapi/fpm/php-fpm.conf.in
32+++ b/sapi/fpm/php-fpm.conf.in
33@@ -16,3 +16,3 @@
34 ; Default Value: none
35-;pid = run/php-fpm.pid
36+;pid = run/php-fpm86.pid
37
38@@ -22,4 +22,4 @@
39 ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
40-; Default Value: log/php-fpm.log
41-;error_log = log/php-fpm.log
42+; Default Value: log/php86/error.log
43+;error_log = log/php86/error.log
44
45@@ -35,4 +35,4 @@
46 ; which must suit common needs.
47-; Default Value: php-fpm
48-;syslog.ident = php-fpm
49+; Default Value: php-fpm86
50+;syslog.ident = php-fpm86
51
52--- a/sapi/fpm/www.conf.in
53+++ b/sapi/fpm/www.conf.in
54@@ -292,7 +292,7 @@
55
56 ; The access log file
57 ; Default: not set
58-;access.log = log/$pool.access.log
59+;access.log = log/php86/$pool.access.log
60
61 ; The access log format.
62 ; The following syntax is allowed
63@@ -372,7 +372,7 @@
64 ; The log file for slow requests
65 ; Default Value: not set
66 ; Note: slowlog is mandatory if request_slowlog_timeout is set
67-;slowlog = log/$pool.log.slow
68+;slowlog = log/php86/$pool.slow.log
69
70 ; The timeout for serving a single request after which a PHP backtrace will be
71 ; dumped to the 'slowlog' file. A value of '0s' means 'off'.
72@@ -484,6 +484,6 @@
73 ; specified at startup with the -d argument
74 ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f [email protected]
75 ;php_flag[display_errors] = off
76-;php_admin_value[error_log] = /var/log/fpm-php.www.log
77+;php_admin_value[error_log] = /var/log/php86/$pool.error.log
78 ;php_admin_flag[log_errors] = on
79 ;php_admin_value[memory_limit] = 32M