OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jul-2003 13:44:49
Branch: HEAD Handle: 2003072212444800
Modified files:
openpkg-src/rsync rc.rsync rsync.spec
Log:
PR#202 run-time check and related issues
Summary:
Revision Changes Path
1.18 +28 -13 openpkg-src/rsync/rc.rsync
1.50 +14 -0 openpkg-src/rsync/rsync.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rc.rsync
============================================================================
$ cvs diff -u -r1.17 -r1.18 rc.rsync
--- openpkg-src/rsync/rc.rsync 22 Jul 2003 08:11:07 -0000 1.17
+++ openpkg-src/rsync/rc.rsync 22 Jul 2003 11:44:48 -0000 1.18
@@ -6,9 +6,13 @@
%config
rsync_enable="$openpkg_rc_def"
rsync_flags=""
+ rsync_bind="127.0.0.1"
+ rsync_port="873"
rsync_nicelevel="10"
- rsync_log_numfiles="5"
- rsync_log_minsize="512K"
+ rsync_log_prolog="true"
+ rsync_log_epilog="true"
+ rsync_log_numfiles="10"
+ rsync_log_minsize="1M"
rsync_log_complevel="9"
%common
@@ -30,29 +34,40 @@
%start -u @l_susr@
rcService rsync enable yes || exit 0
- nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
+ rcService rsync active yes && exit 0
+ flags="$rsync_flags"
+ echo $flags | grep -- --address >/dev/null
+ if [ $? -ne 0 -a ".$rsync_bind" != . ]; then
+ flags="$flags --address=$rsync_bind"
+ fi
+ echo $flags | grep -- --port >/dev/null
+ if [ $? -ne 0 -a ".$rsync_port" != . ]; then
+ flags="$flags --port=$rsync_port"
+ fi
+ nice -n $rsync_nicelevel @l_prefix@/bin/rsync $flags \
--daemon --config=$rsync_cfgfile
+ sleep 2
%stop -u @l_susr@
rcService rsync enable yes || exit 0
+ rcService rsync active no && exit 0
rsync_signal TERM
- # rsync removes the pidfile itself
- # rm -f $rsync_pidfile 2>/dev/null || true
+ sleep 2
%restart -u @l_susr@
rcService rsync enable yes || exit 0
- rsync_signal TERM
- sleep 2
- nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
- --daemon --config=$rsync_cfgfile
+ rcService rsync active no && exit 0
+ rc rsync stop start
%daily -u @l_susr@
rcService rsync enable yes || exit 0
+
+ # rotate logfile
shtool rotate -f \
- -n ${rsync_log_numfiles} -s ${rsync_log_minsize} \
- -d -z ${rsync_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
- -E "test -f $rsync_pidfile && kill -TERM \`cat $rsync_pidfile\`; sleep 2; \
- nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags --daemon
--config=$rsync_cfgfile" \
+ -n ${rsync_log_numfiles} -s ${rsync_log_minsize} -d \
+ -z ${rsync_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
+ -P "${rsync_log_prolog}" \
+ -E "${rsync_log_epilog} && rc rsync restart" \
$rsync_logfile
%env
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 rsync.spec
--- openpkg-src/rsync/rsync.spec 22 Jul 2003 08:11:07 -0000 1.49
+++ openpkg-src/rsync/rsync.spec 22 Jul 2003 11:44:48 -0000 1.50
@@ -114,3 +114,17 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+ # after upgrade, restart service
+ [ $1 -eq 2 ] || exit 0
+ eval `%{l_rc} rsync status 2>/dev/null`
+ [ ".$rsync_active" = .yes ] && %{l_rc} rsync restart
+ exit 0
+
+%preun
+ # before erase, stop service and remove log files
+ [ $1 -eq 0 ] || exit 0
+ %{l_rc} rsync stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/rsync/rsync.log* >/dev/null 2>&1 || true
+ exit 0
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
