diff --git a/apache.spec b/apache.spec index 1b7b384..4837578 100644 --- a/apache.spec +++ b/apache.spec @@ -6,7 +6,7 @@ Name: apache Version: 2.4.34 -Release: 1mamba +Release: 2mamba Epoch: 1 Summary: The Apache webserver Group: System/Servers @@ -436,6 +436,9 @@ exit 0 %{_libdir}/apache/mod_suexec.so %changelog +* Sat Aug 04 2018 Silvan Calarco 2.4.34-2mamba +- update_httpdconf: prevent a duplicate mpm module to be configured causing httpd restart failure + * Mon Jul 16 2018 Automatic Build System 2.4.34-1mamba - automatic version update by autodist diff --git a/httpd-update_httpdconf.sh b/httpd-update_httpdconf.sh index 0978e15..fd09e30 100644 --- a/httpd-update_httpdconf.sh +++ b/httpd-update_httpdconf.sh @@ -37,8 +37,9 @@ ANCHOR_LINE=`grep "^LoadModule .*" $OUTPUT_CONF | tail -n 1 | sed 's|\/|\\\\\/|g # adding new modules for a in ${MODULE[*]}; do + [ ${a:0:4} == "mpm_" ] && continue grep "^LoadModule .* $MODULES_APPEND/mod_$a.so" $OUTPUT_CONF >/dev/null || { - #echo "Configuring module $a" + echo "Configuring module $a" sed -i "/${ANCHOR_LINE}/a \ LoadModule ${a}_module $MODULES_APPEND\/mod_$a.so" $OUTPUT_CONF ANCHOR_LINE=`echo "LoadModule ${a}_module $MODULES_APPEND/mod_$a.so" | sed 's|\/|\\\\\/|g'`