mirror of
https://github.com/zabbix/zabbix-docker.git
synced 2024-12-02 12:43:31 +01:00
Merge branch 'master' into 4.0
This commit is contained in:
commit
b7a33a10bf
@ -12,7 +12,7 @@
|
||||
; Relative path can also be used. They will be prefixed by:
|
||||
; - the global prefix if it's been set (-p argument)
|
||||
; - /usr otherwise
|
||||
include = /etc/php7/fpm.d/*.conf
|
||||
include = /etc/php7/php-fpm.d/*.conf
|
||||
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
; Global Options ;
|
||||
|
@ -12,7 +12,7 @@
|
||||
; Relative path can also be used. They will be prefixed by:
|
||||
; - the global prefix if it's been set (-p argument)
|
||||
; - /usr otherwise
|
||||
include = /etc/php7/fpm.d/*.conf
|
||||
include = /etc/php7/php-fpm.d/*.conf
|
||||
|
||||
;;;;;;;;;;;;;;;;;;
|
||||
; Global Options ;
|
||||
|
Loading…
Reference in New Issue
Block a user