X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finitscripts%2Finit.d%2Fapache;h=5dd39f939f48497b115caf22bea3efe1a164d80b;hp=9e9a6ddb53955f208c3fc6241077506a672643cc;hb=8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd;hpb=65998e0a05463089cb7f6ad29baba5f9ed4fbc69

diff --git a/src/initscripts/init.d/apache b/src/initscripts/init.d/apache
index 9e9a6ddb5..5dd39f939 100644
--- a/src/initscripts/init.d/apache
+++ b/src/initscripts/init.d/apache
@@ -9,12 +9,17 @@
 
 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 (may take a couple of minutes)..."
 			/usr/local/bin/httpscert new  >/dev/null 2>&1
+			evaluate_retval
+
+			# Make sure that the key is written to disk.
+			sync
 		fi
+		boot_mesg "Starting Apache daemon..."
 		/usr/sbin/apachectl -k start
 		evaluate_retval
 		;;
@@ -30,6 +35,12 @@ case "$1" in
 		/usr/sbin/apachectl -k restart
 		evaluate_retval
 		;;
+		
+	reload)
+		boot_mesg "Reloading Apache daemon..."
+		/usr/sbin/apachectl -k graceful
+		evaluate_retval
+		;;
 
 	status)
 		statusproc /usr/sbin/httpd