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, fifteen has been updated via f4b373993fb60809901e7c45d690f569b0d8867c (commit) via 75474c3c493c3f2f4a4ab793910557fffc4182d3 (commit) from 9027a25d92afbbb4486c17deac66b4c439e80520 (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 f4b373993fb60809901e7c45d690f569b0d8867c Merge: 75474c3 9027a25 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 6 08:56:31 2014 +0100

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

commit 75474c3c493c3f2f4a4ab793910557fffc4182d3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Jan 6 08:53:30 2014 +0100

apache: Add message for generating host certs.

On rpi this need 3.5 minutes so it is better to show that this need a while.

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

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

Difference in files: diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache index 4c73a7f..5405d77 100644 --- 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 ;;

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