From 2aa8fadba6934e2792fed00faafc96737bc22a3a Mon Sep 17 00:00:00 2001 From: Kurt Lieber Date: Sun, 6 Jun 2004 14:14:26 +0000 Subject: added additional einfo language, changed chroot to 'yes' instead of 'no' in files/rsyncd.conf and disabled logging of transfers. no changes of substance to the ebuild itself --- app-admin/gentoo-rsync-mirror/ChangeLog | 7 ++- app-admin/gentoo-rsync-mirror/Manifest | 8 ++-- .../files/digest-gentoo-rsync-mirror-1.0-r3 | 0 .../files/rsync-gentoo-portage.sh | 12 ++--- app-admin/gentoo-rsync-mirror/files/rsyncd.conf | 10 ++--- app-admin/gentoo-rsync-mirror/files/rsyncd.init | 26 +++++------ .../gentoo-rsync-mirror-1.0-r3.ebuild | 52 ++++++++++++++++++++++ 7 files changed, 87 insertions(+), 28 deletions(-) create mode 100644 app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r3 create mode 100644 app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r3.ebuild (limited to 'app-admin') diff --git a/app-admin/gentoo-rsync-mirror/ChangeLog b/app-admin/gentoo-rsync-mirror/ChangeLog index 210026a660d6..b66841efeb5f 100644 --- a/app-admin/gentoo-rsync-mirror/ChangeLog +++ b/app-admin/gentoo-rsync-mirror/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-admin/gentoo-rsync-mirror # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.11 2003/12/10 21:39:13 tantive Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/ChangeLog,v 1.12 2004/06/06 14:14:26 klieber Exp $ + + 06 Jun 2004; Kurt Lieber : + added additional einfo language, changed chroot to 'yes' instead of 'no' in + files/rsyncd.conf and disabled logging of transfers. no changes of + substance to the ebuild itself. Fixes #52666 10 Dec 2003; Michael Imhof : Some fixes to improve logging when called with absolute paths. diff --git a/app-admin/gentoo-rsync-mirror/Manifest b/app-admin/gentoo-rsync-mirror/Manifest index a00f7506e371..870ee14b7e4e 100644 --- a/app-admin/gentoo-rsync-mirror/Manifest +++ b/app-admin/gentoo-rsync-mirror/Manifest @@ -1,9 +1,11 @@ MD5 36036912949768c6fcc1961f8d02ccf9 ChangeLog 1474 MD5 03f91c8feff8b1d43591dd30e40ea479 gentoo-rsync-mirror-1.0-r2.ebuild 1582 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373 +MD5 7b20dd87e868b880ba2fd03cb9ab1ebf gentoo-rsync-mirror-1.0-r3.ebuild 1953 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r2 0 -MD5 f316b4a17a1af77af417bf6fccb571af files/rsync-gentoo-portage.sh 692 -MD5 d1d50527cf3c98db07c55c8d6f70fc5f files/rsyncd.conf 743 -MD5 82bb9a3245db03c52b1a6a04f2ad2a5e files/rsyncd.init 546 +MD5 8399d6c94e28a5af0c6ebf7056a8fe49 files/rsync-gentoo-portage.sh 619 +MD5 130d6f529524bedf5631132eab0993c0 files/rsyncd.conf 743 +MD5 5eae35c02ed0ca367e7ff091e107efc9 files/rsyncd.init 657 MD5 508f4e735f2fbacd4a123c002c72e545 files/rsyncd.motd 44 MD5 866f4631fad8ab795f8420dfb8144ffb files/rsynclogparse-extended.pl 3476 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gentoo-rsync-mirror-1.0-r3 0 diff --git a/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r3 b/app-admin/gentoo-rsync-mirror/files/digest-gentoo-rsync-mirror-1.0-r3 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh index 8b4015c79df4..b38e25533015 100644 --- a/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh +++ b/app-admin/gentoo-rsync-mirror/files/rsync-gentoo-portage.sh @@ -1,16 +1,16 @@ #!/bin/bash RSYNC="/usr/bin/rsync" -OPTS="--quiet --recursive --links --perms --times --devices --compress --delete --timeout=600" +OPTS="--quiet --recursive --links --perms --times --devices --delete --timeout=300" #Uncomment the following line only if you have been granted access to rsync1.us.gentoo.org #SRC="rsync://rsync1.us.gentoo.org/gentoo-portage" #If you are waiting for access to our master mirror, select one of our mirrors to mirror from: -SRC="rsync://rsync.gentoo.org/gentoo-portage" -DST="/opt/gentoo-rsync/portage/" +SRC="rsync://rsync2.de.gentoo.org/gentoo-portage" +DST="/space/gentoo/rsync/" -echo "Started update at" `date` >> /var/log/`basename $0`.log 2>&1 +echo "Started update at" `date` >> $0.log 2>&1 logger -t rsync "re-rsyncing the gentoo-portage tree" -${RSYNC} ${OPTS} ${SRC} ${DST} >> /var/log/`basename $0`.log 2>&1 +${RSYNC} ${OPTS} ${SRC} ${DST} >> $0.log 2>&1 -echo "End: "`date` >> /var/log/`basename $0`.log 2>&1 +echo "End: "`date` >> $0.log 2>&1 diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.conf b/app-admin/gentoo-rsync-mirror/files/rsyncd.conf index 12991ddfe86b..444882f18917 100644 --- a/app-admin/gentoo-rsync-mirror/files/rsyncd.conf +++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.conf @@ -1,14 +1,14 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/files/rsyncd.conf,v 1.4 2004/05/02 22:58:16 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/files/rsyncd.conf,v 1.5 2004/06/06 14:14:26 klieber Exp $ -#uid = nobody -#gid = nobody -use chroot = no +uid = nobody +gid = nobody +use chroot = yes max connections = 20 pid file = /var/run/rsyncd.pid motd file = /etc/rsync/rsyncd.motd -transfer logging = yes +transfer logging = no log format = %t %a %m %f %b syslog facility = local3 timeout = 300 diff --git a/app-admin/gentoo-rsync-mirror/files/rsyncd.init b/app-admin/gentoo-rsync-mirror/files/rsyncd.init index 70d6ad5c46fd..1ce940df1fd5 100644 --- a/app-admin/gentoo-rsync-mirror/files/rsyncd.init +++ b/app-admin/gentoo-rsync-mirror/files/rsyncd.init @@ -1,24 +1,24 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/files/rsyncd.init,v 1.4 2004/05/02 22:58:16 mholzer Exp $ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 +or later +# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoo-rsync-mirror/files/rsyncd.init,v 1.5 2004/06/06 14:14:26 klieber Exp $ depend() { - use net +need net } # FYI: --sparce seems to cause problems. -RSYNC_OPTS="--safe-links --compress --bwlimit=700 --timeout=1800" - +RSYNCOPTS="--daemon --safe-links --timeout=300" start() { - ebegin "Starting rsyncd" - rsync --daemon ${RSYNC_OPTS} - eend $? +ebegin "Starting rsync daemon" +start-stop-daemon --start --quiet --pidfile /var/run/rsyncd.pid --nicelevel 15 --exec /usr/bin/rsync -- ${RSYNCOPTS} +eend $? } stop() { - ebegin "Stopping rsyncd" - kill `cat /var/run/rsyncd.pid` - eend $? -} +ebegin "Stopping rsync daemon" +start-stop-daemon --stop --quiet --pidfile /var/run/rsyncd.pid +eend $? +} diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r3.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r3.ebuild new file mode 100644 index 000000000000..98a9f73c9412 --- /dev/null +++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r3.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $ + +IUSE="" +S=${WORKDIR}/gentoo-rsync-mirror-${PV} +DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror" +HOMEPAGE="http://www.gentoo.org/doc/en/rsync.xml" + +DEPEND="virtual/glibc" +RDEPEND="net-misc/rsync + dev-lang/perl" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86 ppc sparc alpha amd64" + +src_install() { + dodir /opt/gentoo-rsync + cp ${FILESDIR}/rsync-gentoo-portage.sh ${D}/opt/gentoo-rsync + cp ${FILESDIR}/rsynclogparse-extended.pl ${D}/opt/gentoo-rsync + insinto etc/rsync + doins ${FILESDIR}/rsyncd.conf + doins ${FILESDIR}/rsyncd.motd + dodir /opt/gentoo-rsync/portage + exeinto /etc/init.d + newexe ${FILESDIR}/rsyncd.init rsyncd +} + +pkg_postinst() { + einfo "The rsync-mirror is now installed into /opt/gentoo-rsync" + einfo "The local portage copy resides in /opt/gentoo-rsync/portage" + einfo "Please change /opt/gentoo-rsync/rsync-gentoo-portage.sh for" + einfo "configuration of your main rsync server and use it so sync." + einfo "Change /etc/rsync/rsyncd.motd to display your correct alias." + einfo + einfo "The service can be started using /etc/init.d/rsyncd start" + einfo "If you are setting up an official mirror, don't forget to add" + einfo "00,30 * * * * root /opt/gentoo-rsync/rsync-gentoo-portage.sh" + einfo "to your /etc/crontab to sync your tree every 30 minutes." + einfo + einfo "If you are setting up a private (unofficial) mirror, you can add" + einfo "0 3 * * * root /opt/gentoo-rsync/rsync-gentoo-portage.sh" + einfo "to your /etc/crontab to sync your tree once per day." + einfo + einfo "****IMPORTANT****" + einfo "If you are setting up a private mirror, DO NOT sync against the" + einfo "gentoo.org official rotations more than once a day. Doing so puts" + einfo "you at risk of having your IP address banned from the rotations." + einfo + einfo "For more information visit: http://www.gentoo.org/doc/en/rsync.xml" +} + -- cgit v1.2.3-65-gdbad