Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache
index 4c73a7fd7edb77a161d309250136819894794060..5405d773e85343276e622941b2d1d63a1a38d259 100644 (file)
--- a/src/initscripts/init.d/apache
+++ b/src/initscripts/init.d/apache
@@ -9,12 +9,14 @@
 
 case "$1" in
        start)
-               boot_mesg "Starting Apache daemon..."
                if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then
                        /usr/local/bin/httpscert read >/dev/null 2>&1
                else
+                       boot_mesg "Generating https host certificate... this may take some minutes..."
                        /usr/local/bin/httpscert new  >/dev/null 2>&1
+                       evaluate_retval
                fi
+               boot_mesg "Starting Apache daemon..."
                /usr/sbin/apachectl -k start
                evaluate_retval
                ;;