View | Details | Raw Unified | Return to bug 24266
Collapse All | Expand All

(-)file_not_specified_in_diff (-3 / +4 lines)
Line  Link Here
0
-- a/control.d/facilities/apache2-mod_php5
0
++ b/control.d/facilities/apache2-mod_php5
Lines 11-16 readonly PHP_DOC_ROOT="/var/www/html" Link Here
11
: ${php_on:?} ${php_off:?}
11
: ${php_on:?} ${php_off:?}
12
12
13
php_timezone=$(php_get_timezone)
13
php_timezone=$(php_get_timezone)
14
: ${php_timezone:="UTC"}
14
15
15
for f in `ls -1 "/etc/php/$PHP_MAJOR/$PHP_SAPI/control.d/"`; do
16
for f in `ls -1 "/etc/php/$PHP_MAJOR/$PHP_SAPI/control.d/"`; do
16
    . "/etc/php/$PHP_MAJOR/$PHP_SAPI/control.d/$f"
17
    . "/etc/php/$PHP_MAJOR/$PHP_SAPI/control.d/$f"
17
-- a/control.d/phpfunctions
18
++ b/control.d/phpfunctions
Lines 189-195 php_get_timezone() { Link Here
189
	ZI_PATH=/usr/share/zoneinfo/
189
	ZI_PATH=/usr/share/zoneinfo/
190
	ZI_SIZE=$(stat --dereference --format=%s $ZI_FILE)
190
	ZI_SIZE=$(stat --dereference --format=%s $ZI_FILE)
191
191
192
	for j in 2 1
192
	[ -d "ZI_PATH" ] && for j in 2 1
193
	do
193
	do
194
		for i in $(find $ZI_PATH -maxdepth $j -mindepth $j -type f -size ${ZI_SIZE}c)
194
		for i in $(find $ZI_PATH -maxdepth $j -mindepth $j -type f -size ${ZI_SIZE}c)
195
		do
195
		do

Return to bug 24266