diff options
| -rw-r--r-- | src/php.eselect.in.in | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in index 603dced..8e25f96 100644 --- a/src/php.eselect.in.in +++ b/src/php.eselect.in.in @@ -461,6 +461,17 @@ set_sapi() { "${link_dir}/${link_name}" || \ die -q "failed to create active ${link_name} symlink" done + + # The call to write_mod_php_conf() in particular needs to take + # place here, in set_sapi(), since otherwise it can get skipped by + # e.g. the update_sapi() function. + if [[ "${sapi}" == "apache2" ]]; then + apache2_php5_config_check + write_mod_php_conf "${target_name}" + echo "Please restart apache for the changes to take effect." + elif [[ "${sapi}" == "fpm" ]]; then + echo "Please restart php-fpm for the changes to take effect." + fi } @@ -508,14 +519,6 @@ do_set() { check_module "${sapi}" set_sapi "${sapi}" "${target}" - - if [[ "${sapi}" == "apache2" ]]; then - apache2_php5_config_check - write_mod_php_conf "$(resolv_target apache2 "${target}")" - echo "Please restart apache for the changes to take effect." - elif [[ "${sapi}" == "fpm" ]]; then - echo "Please restart php-fpm for the changes to take effect." - fi } |