Revision 3646fbcb
Added by Renato Botelho over 9 years ago
src/etc/pfSense.obsoletedfiles | ||
---|---|---|
580 | 580 |
/usr/local/lib/olsrd_power.so.0.3 |
581 | 581 |
/usr/local/lib/olsrd_secure.so.0.5 |
582 | 582 |
/usr/local/lib/olsrd_txtinfo.so.0.1 |
583 |
/usr/local/lib/php.ini |
|
583 | 584 |
/usr/local/lib/php/20060613 |
584 | 585 |
/usr/local/lib/php/20090626 |
585 | 586 |
/usr/local/lib/php/20121212 |
src/etc/rc | ||
---|---|---|
345 | 345 |
/usr/local/sbin/${product}-upgrade -y -b 2 |
346 | 346 |
|
347 | 347 |
# Run the php.ini setup file and populate |
348 |
# /usr/local/etc/php.ini and /usr/local/lib/php.ini
|
|
348 |
# /usr/local/etc/php.ini |
|
349 | 349 |
/etc/rc.php_ini_setup 2>/tmp/php_errors.txt |
350 |
/usr/local/sbin/php-fpm -c /usr/local/lib/php.ini -y /usr/local/lib/php-fpm.conf -RD 2>&1 >/dev/null
|
|
350 |
/usr/local/sbin/php-fpm -c /usr/local/etc/php.ini -y /usr/local/lib/php-fpm.conf -RD 2>&1 >/dev/null
|
|
351 | 351 |
|
352 | 352 |
# Launch external configuration loader for supported platforms |
353 | 353 |
if [ "$PLATFORM" = "nanobsd" ]; then |
src/etc/rc.php-fpm_restart | ||
---|---|---|
5 | 5 |
sleep 2 |
6 | 6 |
|
7 | 7 |
# Run the php.ini setup file and populate |
8 |
# /usr/local/etc/php.ini and /usr/local/lib/php.ini
|
|
8 |
# /usr/local/etc/php.ini |
|
9 | 9 |
/etc/rc.conf_mount_rw |
10 | 10 |
/etc/rc.php_ini_setup 2>/tmp/php_errors.txt |
11 | 11 |
/bin/rm -f /var/run/php-fpm.pid 2>/dev/null |
... | ... | |
13 | 13 |
/etc/rc.conf_mount_ro |
14 | 14 |
echo ">>> Restarting php-fpm" | /usr/bin/logger -p daemon.info -i -t rc.php-fpm_restart |
15 | 15 |
echo ">>> Starting php-fpm" |
16 |
/usr/local/sbin/php-fpm -c /usr/local/lib/php.ini -y /usr/local/lib/php-fpm.conf -RD 2>&1 >/dev/null
|
|
16 |
/usr/local/sbin/php-fpm -c /usr/local/etc/php.ini -y /usr/local/lib/php-fpm.conf -RD 2>&1 >/dev/null
|
|
17 | 17 |
|
src/etc/rc.php_ini_setup | ||
---|---|---|
151 | 151 |
if [ -f /usr/local/etc/php.ini ]; then |
152 | 152 |
/bin/rm /usr/local/etc/php.ini |
153 | 153 |
fi |
154 |
if [ -f /usr/local/lib/php.ini ]; then |
|
155 |
/bin/rm /usr/local/lib/php.ini |
|
156 |
fi |
|
157 | 154 |
LOADED_MODULES=`/usr/local/bin/php-cgi -m | /usr/bin/grep -v "\["` |
158 | 155 |
|
159 | 156 |
unset TIMEZONE |
... | ... | |
176 | 173 |
# Populate a dummy php.ini to avoid |
177 | 174 |
# the file being clobbered and the firewall |
178 | 175 |
# not being able to boot back up. |
179 |
/bin/cat >/usr/local/lib/php.ini <<EOF
|
|
176 |
/bin/cat >/usr/local/etc/php.ini <<EOF
|
|
180 | 177 |
; File generated from /etc/rc.php_ini_setup |
181 | 178 |
output_buffering = "0" |
182 | 179 |
expose_php = Off |
... | ... | |
206 | 203 |
|
207 | 204 |
EOF |
208 | 205 |
|
209 |
# Copy php.ini file to etc/ too (cli) |
|
210 |
/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini |
|
211 |
|
|
212 | 206 |
# Loop through and generate modules to load. |
213 | 207 |
# Take into account modules built into php. |
214 | 208 |
for EXT in $PHPMODULES; do |
... | ... | |
222 | 216 |
if [ "$SHOULDADD" = "true" ]; then |
223 | 217 |
# Ensure extension exists before adding. |
224 | 218 |
if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then |
225 |
echo "extension=${EXT}.so" >> /usr/local/lib/php.ini
|
|
219 |
echo "extension=${EXT}.so" >> /usr/local/etc/php.ini
|
|
226 | 220 |
fi |
227 | 221 |
fi |
228 | 222 |
done |
... | ... | |
231 | 225 |
for EXT in $PHP_ZEND_MODULES; do |
232 | 226 |
# Ensure extension exists before adding. |
233 | 227 |
if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then |
234 |
echo "zend_extension=${EXT}.so" >> /usr/local/lib/php.ini
|
|
228 |
echo "zend_extension=${EXT}.so" >> /usr/local/etc/php.ini
|
|
235 | 229 |
fi |
236 | 230 |
done |
237 | 231 |
|
238 | 232 |
if [ "$LOWMEM" != "TRUE" ]; then |
239 | 233 |
|
240 |
/bin/cat >>/usr/local/lib/php.ini <<EOF
|
|
234 |
/bin/cat >>/usr/local/etc/php.ini <<EOF
|
|
241 | 235 |
|
242 | 236 |
; opcache Settings |
243 | 237 |
opcache.enabled="1" |
... | ... | |
246 | 240 |
|
247 | 241 |
EOF |
248 | 242 |
else |
249 |
/bin/cat >>/usr/local/lib/php.ini <<EOF
|
|
243 |
/bin/cat >>/usr/local/etc/php.ini <<EOF
|
|
250 | 244 |
; opcache Settings |
251 | 245 |
opcache.enabled="0" |
252 | 246 |
EOF |
253 | 247 |
fi |
254 | 248 |
|
255 |
/bin/cat >>/usr/local/lib/php.ini <<EOF
|
|
249 |
/bin/cat >>/usr/local/etc/php.ini <<EOF
|
|
256 | 250 |
|
257 | 251 |
[suhosin] |
258 | 252 |
suhosin.get.max_array_depth = 5000 |
... | ... | |
343 | 337 |
|
344 | 338 |
fi |
345 | 339 |
|
346 |
# Copy php.ini file to etc/ too (cli) |
|
347 |
/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini |
|
348 |
|
|
349 | 340 |
# Remove old log file if it exists. |
350 | 341 |
if [ -f /var/run/php_modules_load_errors.txt ]; then |
351 | 342 |
/bin/rm /var/run/php_modules_load_errors.txt |
... | ... | |
376 | 367 |
if [ "$SHOULDREMOVE" = "true" ]; then |
377 | 368 |
if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then |
378 | 369 |
echo ">>> ${EXT} did not load correctly. Removing from php.ini..." >> /var/run/php_modules_load_errors.txt |
379 |
/bin/cat /usr/local/lib/php.ini | /usr/bin/grep -v $EXT > /tmp/php.ini
|
|
380 |
/bin/rm -f /usr/local/lib/php.ini
|
|
381 |
/bin/mv /tmp/php.ini /usr/local/lib/php.ini
|
|
370 |
/bin/cat /usr/local/etc/php.ini | /usr/bin/grep -v $EXT > /tmp/php.ini
|
|
371 |
/bin/rm -f /usr/local/etc/php.ini
|
|
372 |
/bin/mv /tmp/php.ini /usr/local/etc/php.ini
|
|
382 | 373 |
fi |
383 | 374 |
fi |
384 | 375 |
done |
385 |
|
|
386 |
# Copy php.ini file to etc/ too (cli) |
|
387 |
/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini |
Also available in: Unified diff
Remove /usr/local/lib/php.ini, we don't need 2 copies of this