diff --git a/install_httpd-2.4.sh b/install_httpd-2.4.sh index c345cbd..b0ab6a3 100755 --- a/install_httpd-2.4.sh +++ b/install_httpd-2.4.sh @@ -3150,8 +3150,7 @@ EOF fatal "Loading perl module (file: /usr/local/apache2/conf/httpd.conf) failed" fi - -fi +fi # if $WITH_MOD_PERL ## - Some final tasks @@ -3164,6 +3163,56 @@ echo -e "\t---" echo +if $WITH_MOD_PHP ; then + + # - If PHP version $PHP_VERSION is already installed + # - + if [[ -d "/usr/local/php-${PHP_VERSION}-httpd-${APACHE_VERSION}" ]] \ + && [[ -d "/usr/local/src/php/php-${PHP_VERSION}_httpd-${APACHE_VERSION}" ]]; then + + echo "" >> ${_logdir}/main.log + echo "## - Change into directory /usr/local/src/php/${PHP_VERSION}_${APACHE_VERSION}" >> ${_logdir}/main.log + echo "## -" >> ${_logdir}/main.log + echo "cd \"/usr/local/src/php/php-${PHP_VERSION}_httpd-${APACHE_VERSION}\"" >> ${_logdir}/main.log + cd "/usr/local/src/php/php-${PHP_VERSION}_httpd-${APACHE_VERSION}" >> ${_logdir}/main.log + if [[ $? -eq 0 ]]; then + echo "" >> ${_logdir}/main.log + echo "## - make install for PHP Version ${PHP_VERSION}" >> ${_logdir}/main.log + echo "## -" >> ${_logdir}/main.log + echononl "\t'make install' for PHP Version ${PHP_VERSION}" + make install > /dev/null 2>&1 + if [[ $? -eq 0 ]]; then + echo_ok + else + echo_failed + error "make install for PHP Version ${PHP_VERSION} failed" + fi + fi + + PHP_MAJOR_VERSION="$(echo $PHP_VERSION | cut -d '.' -f1)" + + echo "" >> ${_logdir}/main.log + echo "## - Adjust httpd.conf for handling mod_php.." >> ${_logdir}/main.log + echo "## -" >> ${_logdir}/main.log + cat <> ${_logdir}/main.log +sed -i -r -e "s&(^\s*LoadModule php${PHP_MAJOR_VERSION}_module.*$)&\1\n\n AddType application/x-httpd-php .php\n AddType application/x-httpd-php-source .phps\n&" ${PREFIX}/conf/httpd.conf +EOF + echononl "\tAdjust httpd.conf for handling mod_php.." + sed -i -r \ + -e "s&(^\s*LoadModule php${PHP_MAJOR_VERSION}_module.*$)&\1\n\n AddType application/x-httpd-php .php\n AddType application/x-httpd-php-source .phps\n&" ${PREFIX}/conf/httpd.conf + if [[ $? -eq 0 ]]; then + echo_ok + else + echo_failed + fatal "Loading perl module (file: /usr/local/apache2/conf/httpd.conf) failed" + fi + + echo "" + + fi +fi + + if $SYMLINK_INSTALL_DIR ; then echononl "\tRemove Symlink /usr/local/apache2.." @@ -3370,7 +3419,7 @@ EOF echo "## - Replace '$PREFIX' with '/usr/local/apache2' in service file.." >> ${_logdir}/main.log echo "## -" >> ${_logdir}/main.log echo "perl -i -n -p -e \"s#$PREFIX#/usr/local/apache2#g\" /etc/systemd/system/apache2.service" >> ${_logdir}/main.log - echo -e "\tReplace '$PREFIX' with '/usr/local/apache2' in service file.." + echo -e "\tReplace '$PREFIX' with" echononl "\t '/usr/local/apache2' in service file.." perl -i -n -p -e "s#$PREFIX#/usr/local/apache2#g" /etc/systemd/system/apache2.service >> ${_logdir}/main.log 2>&1 if [ "$?" = "0" ]; then