OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Oct-2003 18:15:42
Branch: HEAD Handle: 2003101417154200
Modified files:
openpkg-src/apache2 apache2.spec rc.apache2
Log:
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
Summary:
Revision Changes Path
1.31 +3 -0 openpkg-src/apache2/apache2.spec
1.10 +3 -2 openpkg-src/apache2/rc.apache2
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/apache2.spec
============================================================================
$ cvs diff -u -r1.30 -r1.31 apache2.spec
--- openpkg-src/apache2/apache2.spec 14 Oct 2003 14:03:11 -0000 1.30
+++ openpkg-src/apache2/apache2.spec 14 Oct 2003 16:15:42 -0000 1.31
@@ -85,6 +85,9 @@
%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} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache2/rc.apache2
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.apache2
--- openpkg-src/apache2/rc.apache2 14 Oct 2003 13:03:20 -0000 1.9
+++ openpkg-src/apache2/rc.apache2 14 Oct 2003 16:15:42 -0000 1.10
@@ -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}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
