OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jun-2005 20:23:00
Branch: HEAD Handle: 2005061319230000
Modified files:
openpkg-src/rsync rc.rsync rsync.conf
Log:
modernize daemon configuration by moving network binding into
configuration file (which is not supported by rsync) and remove
RSYNC_RSH stuff at all because rsync does SSH by default since a
longer time
Summary:
Revision Changes Path
1.24 +2 -20 openpkg-src/rsync/rc.rsync
1.4 +3 -0 openpkg-src/rsync/rsync.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rc.rsync
============================================================================
$ cvs diff -u -r1.23 -r1.24 rc.rsync
--- openpkg-src/rsync/rc.rsync 2 Jan 2005 16:38:47 -0000 1.23
+++ openpkg-src/rsync/rc.rsync 13 Jun 2005 18:23:00 -0000 1.24
@@ -7,8 +7,6 @@
rsync_enable="$openpkg_rc_def"
rsync_daemon="no"
rsync_flags=""
- rsync_bind="127.0.0.1"
- rsync_port="873"
rsync_nicelevel="10"
rsync_log_prolog="true"
rsync_log_epilog="true"
@@ -37,17 +35,8 @@
rcService rsync enable yes || exit 0
rcService rsync active yes && exit 0
rcVarIsYes rsync_daemon || 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
+ nice -n $rsync_nicelevel @l_prefix@/bin/rsync \
+ $rsync_flags --daemon --config=$rsync_cfgfile
sleep 2
%stop -u @l_susr@
@@ -73,10 +62,3 @@
-E "${rsync_log_epilog}; rc rsync restart" \
$rsync_logfile
-%env
- rcService rsync enable yes || exit 0
- if [ -f "@l_prefix@/bin/ssh" ]; then
- RSYNC_RSH="@l_prefix@/bin/ssh"
- export RSYNC_RSH
- fi
-
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsync/rsync.conf
============================================================================
$ cvs diff -u -r1.3 -r1.4 rsync.conf
--- openpkg-src/rsync/rsync.conf 4 Apr 2002 15:16:08 -0000 1.3
+++ openpkg-src/rsync/rsync.conf 13 Jun 2005 18:23:00 -0000 1.4
@@ -6,6 +6,9 @@
lock file = @l_prefix@/var/rsync/rsync.lck
pid file = @l_prefix@/var/rsync/rsync.pid
log file = @l_prefix@/var/rsync/rsync.log
+
+address = 127.0.0.1
+port = 873
max connections = 20
timeout = 60
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
