mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 20:55:19 +03:00
99ee74a012
- fixes #5220 - sqlite3 & pdo_sqlite now uses system libsqlite3 not bundled one (fixes #5198) - change fpm log & pid paths and names to not intersect with main/php - change fpm init script to use reopen logs signal - add logrotate script
76 lines
2.4 KiB
Diff
76 lines
2.4 KiB
Diff
--- a/sapi/fpm/fpm/fpm_conf.c
|
|
+++ b/sapi/fpm/fpm/fpm_conf.c
|
|
@@ -1178,7 +1178,7 @@
|
|
}
|
|
|
|
if (!fpm_global_config.error_log) {
|
|
- fpm_global_config.error_log = strdup("log/php-fpm.log");
|
|
+ fpm_global_config.error_log = strdup("log/php7/error.log");
|
|
}
|
|
|
|
#ifdef HAVE_SYSTEMD
|
|
@@ -1189,7 +1189,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-fpm7");
|
|
}
|
|
|
|
if (fpm_global_config.syslog_facility < 0) {
|
|
@@ -1681,7 +1681,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/php-fpm7.conf", fpm_globals.prefix);
|
|
}
|
|
|
|
if (!tmp) {
|
|
--- a/sapi/fpm/php-fpm.conf.in
|
|
+++ b/sapi/fpm/php-fpm.conf.in
|
|
@@ -14,14 +14,14 @@
|
|
; Pid file
|
|
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
|
|
; Default Value: none
|
|
-;pid = run/php-fpm.pid
|
|
+;pid = run/php-fpm7.pid
|
|
|
|
; Error log file
|
|
; If it's set to "syslog", log is sent to syslogd instead of being written
|
|
; in a local file.
|
|
; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
|
|
; Default Value: log/php-fpm.log
|
|
-;error_log = log/php-fpm.log
|
|
+;error_log = log/php7/error.log
|
|
|
|
; syslog_facility is used to specify what type of program is logging the
|
|
; message. This lets syslogd specify that messages from different facilities
|
|
--- a/sapi/fpm/www.conf.in
|
|
+++ b/sapi/fpm/www.conf.in
|
|
@@ -250,7 +250,7 @@
|
|
|
|
; The access log file
|
|
; Default: not set
|
|
-;access.log = log/$pool.access.log
|
|
+;access.log = log/php7/$pool.access.log
|
|
|
|
; The access log format.
|
|
; The following syntax is allowed
|
|
@@ -314,7 +314,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/php7/$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'.
|
|
@@ -408,6 +408,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/php7/www.error.log
|
|
;php_admin_flag[log_errors] = on
|
|
;php_admin_value[memory_limit] = 32M
|