diff options
| author | Renato Botelho <renato@netgate.com> | 2015-10-13 07:43:12 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-10-13 07:43:12 -0300 |
| commit | 3646fbcb70e0f7e328e7657115ebba3dcb505ff7 (patch) | |
| tree | a0f7565b73d6d9422423eb84144cc950bbcd776b /src/etc/rc.php_ini_setup | |
| parent | 96d5ca1169c2435572065c103639988b7ef7c9d3 (diff) | |
| download | pfsense-3646fbcb70e0f7e328e7657115ebba3dcb505ff7.zip pfsense-3646fbcb70e0f7e328e7657115ebba3dcb505ff7.tar.gz | |
Remove /usr/local/lib/php.ini, we don't need 2 copies of this
Diffstat (limited to 'src/etc/rc.php_ini_setup')
| -rwxr-xr-x | src/etc/rc.php_ini_setup | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup index b4038e7..de2d34e 100755 --- a/src/etc/rc.php_ini_setup +++ b/src/etc/rc.php_ini_setup @@ -151,9 +151,6 @@ PHP_ZEND_MODULES="" if [ -f /usr/local/etc/php.ini ]; then /bin/rm /usr/local/etc/php.ini fi -if [ -f /usr/local/lib/php.ini ]; then - /bin/rm /usr/local/lib/php.ini -fi LOADED_MODULES=`/usr/local/bin/php-cgi -m | /usr/bin/grep -v "\["` unset TIMEZONE @@ -176,7 +173,7 @@ fi # Populate a dummy php.ini to avoid # the file being clobbered and the firewall # not being able to boot back up. -/bin/cat >/usr/local/lib/php.ini <<EOF +/bin/cat >/usr/local/etc/php.ini <<EOF ; File generated from /etc/rc.php_ini_setup output_buffering = "0" expose_php = Off @@ -206,9 +203,6 @@ date.timezone="${TIMEZONE}" EOF -# Copy php.ini file to etc/ too (cli) -/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini - # Loop through and generate modules to load. # Take into account modules built into php. for EXT in $PHPMODULES; do @@ -222,7 +216,7 @@ for EXT in $PHPMODULES; do if [ "$SHOULDADD" = "true" ]; then # Ensure extension exists before adding. if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then - echo "extension=${EXT}.so" >> /usr/local/lib/php.ini + echo "extension=${EXT}.so" >> /usr/local/etc/php.ini fi fi done @@ -231,13 +225,13 @@ done for EXT in $PHP_ZEND_MODULES; do # Ensure extension exists before adding. if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then - echo "zend_extension=${EXT}.so" >> /usr/local/lib/php.ini + echo "zend_extension=${EXT}.so" >> /usr/local/etc/php.ini fi done if [ "$LOWMEM" != "TRUE" ]; then - /bin/cat >>/usr/local/lib/php.ini <<EOF + /bin/cat >>/usr/local/etc/php.ini <<EOF ; opcache Settings opcache.enabled="1" @@ -246,13 +240,13 @@ opcache.memory_consumption="${OPCACHEMEMSIZE}" EOF else - /bin/cat >>/usr/local/lib/php.ini <<EOF + /bin/cat >>/usr/local/etc/php.ini <<EOF ; opcache Settings opcache.enabled="0" EOF fi - /bin/cat >>/usr/local/lib/php.ini <<EOF + /bin/cat >>/usr/local/etc/php.ini <<EOF [suhosin] suhosin.get.max_array_depth = 5000 @@ -343,9 +337,6 @@ EOF fi -# Copy php.ini file to etc/ too (cli) -/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini - # Remove old log file if it exists. if [ -f /var/run/php_modules_load_errors.txt ]; then /bin/rm /var/run/php_modules_load_errors.txt @@ -376,12 +367,9 @@ for EXT in $PHPMODULESLC; do if [ "$SHOULDREMOVE" = "true" ]; then if [ -f "${EXTENSIONSDIR}${EXT}.so" ]; then echo ">>> ${EXT} did not load correctly. Removing from php.ini..." >> /var/run/php_modules_load_errors.txt - /bin/cat /usr/local/lib/php.ini | /usr/bin/grep -v $EXT > /tmp/php.ini - /bin/rm -f /usr/local/lib/php.ini - /bin/mv /tmp/php.ini /usr/local/lib/php.ini + /bin/cat /usr/local/etc/php.ini | /usr/bin/grep -v $EXT > /tmp/php.ini + /bin/rm -f /usr/local/etc/php.ini + /bin/mv /tmp/php.ini /usr/local/etc/php.ini fi fi done - -# Copy php.ini file to etc/ too (cli) -/bin/cp /usr/local/lib/php.ini /usr/local/etc/php.ini |
