From 2f0b94dd6a4a174471bba1ff049c67f2e1b22531 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 13 May 2020 13:05:48 +0200 Subject: [PATCH] Bug 25480: Don't hide apache error and display incorrect error When searching if some apache mod are enable we are hiding the error (2> /dev/null) and display an error about the (guessed) missing module. It can lead to wrong tracks, let display the original apache error if there is one. This is linked with https://gitlab.com/koha-community/koha-testing-docker/-/merge_requests/119 --- debian/scripts/koha-create | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create index 43d58fd2b5..45c1ef644f 100755 --- a/debian/scripts/koha-create +++ b/debian/scripts/koha-create @@ -151,16 +151,16 @@ check_apache_config() { # Check that mpm_itk is installed and enabled - if ! /usr/sbin/apachectl -M 2> /dev/null | grep -q 'mpm_itk'; then + if ! /usr/sbin/apachectl -M | grep -q 'mpm_itk'; then # Check Apache version APACHE_DISABLE_MPM_MSG="" if /usr/sbin/apache2ctl -v | grep -q "Server version: Apache/2.4"; then # mpm_event or mpm_worker need to be disabled first. mpm_itk depends # on mpm_prefork, which is enabled if needed. See # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=734865 - if /usr/sbin/apachectl -M 2> /dev/null | grep -q 'mpm_event'; then + if /usr/sbin/apachectl -M | grep -q 'mpm_event'; then APACHE_DISABLE_MPM_MSG=" sudo a2dismod mpm_event ;" - elif /usr/sbin/apachectl -M 2> /dev/null | grep -q 'mpm_worker'; then + elif /usr/sbin/apachectl -M | grep -q 'mpm_worker'; then APACHE_DISABLE_MPM_MSG=" sudo a2dismod mpm_worker ;" # else mpm_prefork: a2enmod mpm_itk works fi @@ -179,7 +179,7 @@ EOM fi # Check that mod_rewrite is installed and enabled. - if ! /usr/sbin/apachectl -M 2> /dev/null | grep -q 'rewrite_module'; then + if ! /usr/sbin/apachectl -M | grep -q 'rewrite_module'; then cat 1>&2 < /dev/null | grep -q 'cgi_module'; then + if ! /usr/sbin/apachectl -M | grep -q 'cgi_module'; then cat 1>&2 << EOM Koha requires mod_cgi to be enabled within Apache in order to run. Typically this can be enabled with: @@ -204,7 +204,7 @@ EOM # Check that mod_ssl is installed and enabled. if [ "$CLO_LETSENCRYPT" = "yes" ]; then - if ! /usr/sbin/apachectl -M 2> /dev/null | grep -q 'ssl_module'; then + if ! /usr/sbin/apachectl -M | grep -q 'ssl_module'; then cat 1>&2 <