From 1c4e2732a85cbc34298a04a1fbfb0735686fc711 Mon Sep 17 00:00:00 2001
From: Michael Schloh von Bennewitz <ms@openpkg.org>
Date: Tue, 14 Oct 2003 16:15:42 +0000
Subject: [PATCH] Correct log file modes, substitute localhost IP address in
 config, and add a sleep timer to %stop section to give the server a chance to
 remove its last run pid files

---
 apache2/apache2.spec | 3 +++
 apache2/rc.apache2   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apache2/apache2.spec b/apache2/apache2.spec
index bdb31b5444..4d564369ee 100644
--- a/apache2/apache2.spec
+++ b/apache2/apache2.spec
@@ -85,6 +85,9 @@ Conflicts:    apache, apr
 %install
     rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+    %{l_shtool} subst \
+        -e 's;^\(Listen\).*;\1 127.0.0.1:80;' \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/apache2/httpd.conf
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
diff --git a/apache2/rc.apache2 b/apache2/rc.apache2
index aa1523f6e6..d45f9623ff 100644
--- a/apache2/rc.apache2
+++ b/apache2/rc.apache2
@@ -43,6 +43,7 @@
     rcService apache2 enable yes || exit 0
     rcService apache2 active no && exit 0
     @l_prefix@/sbin/apachectl stop
+    sleep 2
 
 %restart -u @l_susr@
     rcService apache2 enable yes || exit 0
@@ -57,13 +58,13 @@
     hintfile=`rcTmp -f -n hint`
     shtool rotate -f \
         -n ${apache2_log_rotsteps} -s ${apache2_log_rotminsize} -d \
-        -z ${apache2_log_rotcomplevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
+        -z ${apache2_log_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
         -P "$apache2_log_rotprolog" \
         -E "$apache2_log_rotepilog && echo 1 >$hintfile" \
         ${apache2_log_files}
     shtool rotate -f \
         -n ${apache2_err_rotsteps} -s ${apache2_err_rotminsize} -d \
-        -z ${apache2_err_rotcomplevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
+        -z ${apache2_err_rotcomplevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
         -P "$apache2_err_rotprolog" \
         -E "$apache2_err_rotepilog && echo 1 >$hintfile" \
         ${apache2_err_files}