extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-03-21 01:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into trunk

Browse Source
This commit is contained in:
root 2019-01-13 00:50:33 +02:00
commit 2bde2d04ad
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-nginx-mysql/alpine/conf/etc/php7/php-fpm.conf
View File

@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by: ; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument) ; - the global prefix if it's been set (-p argument)
; - /usr otherwise ; - /usr otherwise
include = /etc/php7/fpm.d/*.conf include = /etc/php7/php-fpm.d/*.conf
;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;
; Global Options ; ; Global Options ;

2
web-nginx-pgsql/alpine/conf/etc/php7/php-fpm.conf
View File

@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by: ; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument) ; - the global prefix if it's been set (-p argument)
; - /usr otherwise ; - /usr otherwise
include = /etc/php7/fpm.d/*.conf include = /etc/php7/php-fpm.d/*.conf
;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;
; Global Options ; ; Global Options ;