[svn] r5084 - in trunk/tools/mrepo: . config
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Jan 16 16:19:53 CET 2007
Author: dag
Date: 2007-01-16 16:19:51 +0100 (Tue, 16 Jan 2007)
New Revision: 5084
Modified:
trunk/tools/mrepo/ChangeLog
trunk/tools/mrepo/config/mrepo-example.conf
trunk/tools/mrepo/mrepo
Log:
Cleaned up mrepo-example.conf (Gareth Armstrong)
Modified: trunk/tools/mrepo/ChangeLog
===================================================================
--- trunk/tools/mrepo/ChangeLog 2007-01-16 12:53:09 UTC (rev 5083)
+++ trunk/tools/mrepo/ChangeLog 2007-01-16 15:19:51 UTC (rev 5084)
@@ -2,6 +2,7 @@
- Fixed a few typos (Ian Forde)
- Added promoteepoch directive to disable it for older distributions (rhel2.1, rh7.3)
- Fixed a problem with the disabled directive (disabled = no was ignored)
+- Cleaned up mrepo-example.conf (Gareth Armstrong)
* 0.8.4 - Sint-Jacobsplein - released 13/12/2006
- Renamed Yam to mrepo (Matthew Hannigan)
Modified: trunk/tools/mrepo/config/mrepo-example.conf
===================================================================
--- trunk/tools/mrepo/config/mrepo-example.conf 2007-01-16 12:53:09 UTC (rev 5083)
+++ trunk/tools/mrepo/config/mrepo-example.conf 2007-01-16 15:19:51 UTC (rev 5084)
@@ -13,23 +13,40 @@
## The location of the example .shtml files
htmldir = /usr/share/mrepo/html
+## The location of the ISO images and RPM files
+srcdir = /var/mrepo
+
+## The location of the generated repositories
+wwwdir = /var/www/mrepo
+
+## The location of the dist config files
+confdir = /etc/mrepo.conf.d
+
+## The location of the cachedir (used by yum)
+cachedir = /var/cache/mrepo
+
+## The location of the lockdir
+lockdir = /var/cache/mrepo
+
## The location of the (latest) pxelinux bootcode
pxelinux = /usr/lib/syslinux/pxelinux.0
-## The location of the ISO images and RPM files
-srcdir = /var/mrepo
-
## The location of the Yam TFTP files
tftpdir = /tftpboot/mrepo
-## The location of the generated repositories
-wwwdir = /var/www/mrepo
+## The location of the logfile
+logfile = /var/log/mrepo.log
## The location of the different executables
createrepocmd = /usr/bin/createrepo
genbasedircmd = /usr/bin/genbasedir
+hardlinkcmd = /usr/sbin/hardlink
+hardlinkpluscmd = /usr/bin/hardlink++
lftpcmd = /usr/bin/lftp
+mirrordircmd = /usr/bin/mirrordir
mountcmd = /bin/mount
+repoviewcmd = /usr/bin/repoview
+rhngetcmd = /usr/bin/rhnget
rsynccmd = /usr/bin/rsync
umountcmd = /bin/umount
yumarchcmd = /usr/bin/yum-arch
@@ -52,31 +69,21 @@
http_proxy =
https_proxy =
+## You can have mrepo send out report mails
+# mailto = user at domain.com user2 at domain2.com
+mailto =
+mailfrom = mrepo at hostname
+smtp-server = localhost
+
+## Default output (put this to yes if you want mrepo to be silent by default)
+quiet = no
+
## Hardlink files in the srcdir before ending Yam
hardlink = no
## Do you want to share the ISO files in wwwdir ?
shareiso = yes
-## Do you want to create repo indexes ?
-repoindexcmd =
-
-## Limit the bandwidth used by rsync in kilobytes per seconds
-rsync-bandwidth-limit =
-
-## Clean up packages that are not on the sending side ?
-rsync-cleanup = yes
-
-## Exclude debuginfo or source packages ?
-rsync-exclude-debug = yes
-rsync-exclude-srpm = yes
-
-## Add extra options to rsync
-rsync-options = -rtHL --partial
-
-## Set the I/O timeout in seconds
-rsync-timeout =
-
## Limit the bandwidth used by lftp (in B/secs)
lftp-bandwidth-limit =
@@ -90,8 +97,11 @@
## Add extra options to lftp (eg. -d for debugging lftp)
lftp-options =
+## Add extra commands to lftp (eg. set dns:fatal-timeout 5)
+lftp-commands =
+
## Add extra options to lftp mirror command
-lftp-mirror-options = -a -P
+lftp-mirror-options = -c -P
## Set the I/O timeout in seconds
lftp-timeout =
@@ -106,10 +116,41 @@
## Add extra options to mirrordir
mirrordir-options =
-## Skip metadata generation for certain repositories
-skip-metadata = all
+## Set RHN login username:password
+rhnlogin =
+## Add extra options to rhnget
+rhnget-options =
+## Clean up packages that are not on the sending side ?
+rhnget-cleanup = yes
+
+## Download older versions of a certain package ?
+rhnget-download-all = no
+
+## Limit the bandwidth used by rsync in kilobytes per seconds
+rsync-bandwidth-limit =
+
+## Clean up packages that are not on the sending side ?
+rsync-cleanup = yes
+
+## Exclude debuginfo or source packages ?
+rsync-exclude-debug = yes
+rsync-exclude-srpm = yes
+
+## Add extra options to rsync
+rsync-options = -rtHL --partial
+
+## Set the I/O timeout in seconds
+rsync-timeout =
+
+## Add extra options to createrepo
+createrepo-options = -p
+
+## Add extra options to repoview
+repoview-options =
+
+
### Example1: Using ISO files (put ISOs in /var/mrepo/dist1-i386), i386 is default arch
[dist1]
name = Distribution example $release ($arch)
Modified: trunk/tools/mrepo/mrepo
===================================================================
--- trunk/tools/mrepo/mrepo 2007-01-16 12:53:09 UTC (rev 5083)
+++ trunk/tools/mrepo/mrepo 2007-01-16 15:19:51 UTC (rev 5084)
@@ -168,6 +168,8 @@
self.arch = self.getoption('main', 'arch', 'i386')
self.metadata = self.getoption('main', 'metadata', 'repomd repoview')
+ self.shareiso = self.getoption('main', 'shareiso', 'yes') not in disable
+
self.quiet = self.getoption('main', 'quiet', 'no') not in disable
if op.verbose == 1 and self.quiet:
op.verbose = 0
@@ -187,16 +189,13 @@
self.cmd['lftp'] = self.getoption('main', 'lftpcmd', '/usr/bin/lftp')
self.cmd['mirrordir'] = self.getoption('main', 'mirrordircmd', '/usr/bin/mirrordir')
self.cmd['mount'] = self.getoption('main', 'mountcmd', '/bin/mount')
- self.cmd['repoview'] = self.getoption('main', 'repoview', '/usr/bin/repoview')
- self.cmd['rhnget'] = self.getoption('main', 'rhnget', '/usr/bin/rhnget')
+ self.cmd['repoview'] = self.getoption('main', 'repoviewcmd', '/usr/bin/repoview')
+ self.cmd['rhnget'] = self.getoption('main', 'rhngetcmd', '/usr/bin/rhnget')
self.cmd['rsync'] = self.getoption('main', 'rsynccmd', '/usr/bin/rsync')
self.cmd['umount'] = self.getoption('main', 'umountcmd', '/bin/umount')
self.cmd['yumarch'] = self.getoption('main', 'yumarchcmd', '/usr/bin/yum-arch')
- self.mirrordircleanup = self.getoption('main', 'mirrordir-cleanup', 'yes') not in disable
- self.mirrordirexcldebug = self.getoption('main', 'mirrordir-exclude-debug', 'yes') not in disable
- self.mirrordirexclsrpm = self.getoption('main', 'mirrordir-exclude-srpm', 'yes') not in disable
- self.mirrordiroptions = self.getoption('main', 'mirrordir-options', '')
+ self.createrepooptions = self.getoption('main', 'createrepo-options', '-p')
self.lftpbwlimit = self.getoption('main', 'lftp-bandwidth-limit', None)
self.lftpcleanup = self.getoption('main', 'lftp-cleanup', 'yes') not in disable
@@ -207,6 +206,11 @@
self.lftpmirroroptions = self.getoption('main', 'lftp-mirror-options', '-c -P')
self.lftptimeout = self.getoption('main', 'lftp-timeout', None)
+ self.mirrordircleanup = self.getoption('main', 'mirrordir-cleanup', 'yes') not in disable
+ self.mirrordirexcldebug = self.getoption('main', 'mirrordir-exclude-debug', 'yes') not in disable
+ self.mirrordirexclsrpm = self.getoption('main', 'mirrordir-exclude-srpm', 'yes') not in disable
+ self.mirrordiroptions = self.getoption('main', 'mirrordir-options', '')
+
self.rhnlogin = self.getoption('main', 'rhnlogin', None)
self.rhngetoptions = self.getoption('main', 'rhnget-options', '')
self.rhngetcleanup = self.getoption('main', 'rhnget-cleanup', 'yes') not in disable
@@ -219,11 +223,8 @@
self.rsyncoptions = self.getoption('main', 'rsync-options', '-rtHL --partial')
self.rsynctimeout = self.getoption('main', 'rsync-timeout', None)
- self.createrepooptions = self.getoption('main', 'createrepo-options', '-p')
self.repoviewoptions = self.getoption('main', 'repoview-options', '')
- self.shareiso = self.getoption('main', 'shareiso', 'yes') not in disable
-
self.alldists = []
self.dists = []
@@ -1114,7 +1115,7 @@
mkdir(path)
cmds = cf.lftpcommands + ';'
-# cmds = 'set dns:fatal-timeout 5;'
+# cmds = 'set dns:fatal-timeout 5'
if cf.lftptimeout:
cmds = cmds + ' set net:timeout %s;' % cf.lftptimeout
if cf.lftpbwlimit:
More information about the svn-commits
mailing list