[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73794dad879be8c3533030f229e269123ed2a51a

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 73794dad879be8c3533030f229e269123ed2a51a

[git]

[-- Attachment #1: Type: text/plain, Size: 1958 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  73794dad879be8c3533030f229e269123ed2a51a (commit)
      from  c2bf88c1a4dd030fd8838cc8388e265f1e748a29 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73794dad879be8c3533030f229e269123ed2a51a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sat Feb 1 19:33:50 2014 +0100

    apache: Don't show the signal of sync.
    
    evaluate_retval prints the return code of sync
    which is not what we want here.
    
    Also changed some console output.

-----------------------------------------------------------------------

Summary of changes:
 src/initscripts/init.d/apache | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache
index af03776..5dd39f9 100644
--- a/src/initscripts/init.d/apache
+++ b/src/initscripts/init.d/apache
@@ -12,10 +12,12 @@ case "$1" in
 		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..."
+			boot_mesg "Generating HTTPS host certificate (may take a couple of minutes)..."
 			/usr/local/bin/httpscert new  >/dev/null 2>&1
-			sync
 			evaluate_retval
+
+			# Make sure that the key is written to disk.
+			sync
 		fi
 		boot_mesg "Starting Apache daemon..."
 		/usr/sbin/apachectl -k start


hooks/post-receive
--
IPFire 2.x development tree