=================================================================== RCS file: /cvs/cvsweb/Attic/cvsweb.conf,v retrieving revision 3.8 retrieving revision 3.24 diff -u -p -r3.8 -r3.24 --- cvsweb/Attic/cvsweb.conf 2000/09/03 18:25:47 3.8 +++ cvsweb/Attic/cvsweb.conf 2001/04/24 15:24:01 3.24 @@ -4,13 +4,27 @@ # # (c) 1998-1999 H. Zeller # 1999 H. Nordstrom -# 2000 A. MUSHA +# 2000-2001 A. MUSHA # based on work by Bill Fenner -# $zId: cvsweb.conf,v 3.27 2000/07/27 10:16:39 kcoar Exp $ -# $Id: cvsweb.conf,v 3.8 2000/09/03 18:25:47 knu Exp $ +# $Id: cvsweb.conf,v 3.24 2001/04/24 15:24:01 knu Exp $ +# $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 3.23 2001/01/14 09:04:04 knu Exp $ # ### +# Set the path for the following commands: +# uname, cvs, rlog, rcsdiff +# gzip (if you enable $allow_compress) +# tar,rm (if you enable $allow_tar) +$command_path = '/bin:/usr/bin:/usr/local/bin'; + +# Search the above directories for each command +for (qw(uname cvs rlog rcsdiff gzip tar rm)) { + $CMD{$_} = search_path($_); +} + +# The name of the operating system implementation +chomp($uname = `$CMD{uname}`); + ############## # CVS Root ############## @@ -23,46 +37,46 @@ # to the CVS repository so :pserver:someone@xyz.com:/data/cvsroot # won't work! -# 'symbolic_name' 'path_to_the_actual_repository' -%CVSROOT = ( - 'local' => '/home/cvs', - 'freebsd' => '/home/ncvs', - ); +# 'symbolic_name' => ['name_to_display', 'path_to_the_actual_repository'] +# Listed in the order specified: +@CVSrepositories = ( + 'local' => ['Local Repository', '/home/cvs'], +# 'freebsd' => ['FreeBSD', '/home/ncvs'], +# 'openbsd' => ['OpenBSD', '/home/ncvs'], +# 'netbsd' => ['NetBSD', '/home/ncvs'], +# 'ruby' => ['Ruby', '/var/anoncvs/ruby'], + ); -%CVSROOTdescr = ( - 'local' => 'Local Repository', - 'freebsd' => 'FreeBSD', - ); - # This tree is enabled by default when # you enter the page -$cvstreedefault = 'local'; +$cvstreedefault = $CVSrepositories[2 * 0]; # The first one ############## -# PR categoties +# Bug tracking system options +# ("PR" means Problem Report, as in GNATS) ############## -@prcategories = qw( - advocacy - alpha - bin - conf - docs - gnu - i386 - kern - misc - ports - sparc - ); +#@prcategories = qw( +# advocacy +# alpha +# bin +# conf +# docs +# gnu +# i386 +# kern +# misc +# pending +# ports +# sparc +# ); +# +#$prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=%s"; +# +#$prkeyword = "PR"; ############## -# query-pr.cgi +# Manual gateway ############## -$prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi?pr=%s"; - -############## -# man.cgi -############## $mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html"; ############## @@ -96,7 +110,7 @@ $mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos= # u Unified diff # c Context diff # s Side by side - "f" => ($is_textbased ? "u" : "h"), + "f" => "u", # hidecvsroot: Don't show the CVSROOT directory # 1 Hide CVSROOT directory @@ -113,9 +127,12 @@ $mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos= # some layout stuff ############## -# color settings in the body-tag +# The body-tag for directory views and logs $body_tag = ''; +# The body-tag for diffs and annotations +$body_tag_for_src = ''; + # Wanna have a logo on the page ? $logo = '

'; @@ -125,10 +142,6 @@ $defaulttitle = "CVS Repository"; # The address is shown on the footer $address = "CVSweb by <knu\@FreeBSD.org>"; -# Default page background color for the diffs -# and annotations -$backcolor = "#eeeeee"; - # color of navigation Header for # diffs and annotations $navigationHeaderColor = '#9999ee'; @@ -147,25 +160,28 @@ a form at the bottom of the page that allows you to display diffs between arbitrary revisions.

-This script has been written by Bill Fenner -<fenner\@FreeBSD.org> -and improved by Henner Zeller -<zeller\@think.de>, -Henrik Nordström -<hno\@hem.passagen.se>, and -Ken Coar -<Ken.Coar\@Golux.Com>, then -Akinori MUSHA <knu\@FreeBSD.org> -brought it back to FreeBSD community and added more facilities; -it is covered by the -BSD-Licence. +This script has been written by Bill Fenner <fenner\@FreeBSD.org> and +improved by Henner Zeller <zeller\@think.de>, Henrik +Nordström <hno\@hem.passagen.se>, and +Ken Coar <Ken.Coar\@Golux.Com>, then +Akinori MUSHA <knu\@FreeBSD.org> brought it +back to FreeBSD community and made further improvements; it is covered +by the BSD-Licence.

If you would like to use this CGI script on your own web server and -CVS tree, see Zeller's -CVSweb distribution site. Bill's original script can be found -here. +CVS tree, download the latest version here, and also check +out Zeller's CVSweb +distribution site. Bill's original script can be found here.

Please send any suggestions, comments, etc. to @@ -193,12 +209,14 @@ EOT # These default icons are coming with apache. # If these icons are too large, check out the miniicons in the # icons/ directory; they have a width/height of 16/16 -# format: TEXT ICON-URL width height +my $iconsdir = "/icons"; +# format: TEXT ICON-URL width height %ICONS = ( - back => [ ("[BACK]", "/icons/cvsweb/back.gif", 20, 22) ], - dir => [ ("[DIR]", "/icons/cvsweb/dir.gif", 20, 22) ], - file => [ ("[TXT]", "/icons/cvsweb/text.gif", 20, 22) ], - ); + back => [ ("[BACK]", "$iconsdir/back.gif", 20, 22) ], + dir => [ ("[DIR]", "$iconsdir/dir.gif", 20, 22) ], + file => [ ("[TXT]", "$iconsdir/text.gif", 20, 22) ], + ); +undef $iconsdir; # the length to which the last logentry should # be truncated when shown in the directory view @@ -275,7 +293,8 @@ $showfunc = 1; # For each pair of regexps, files that match the first regexp will be diff'ed # with an '-F' option with the second regexp. %funcline_regexp = ( - "\\.(4th|fr)\$" => "\$^\\| \\|\t\$: ", + "\\.(4th|fr)\$" => "\$^\\|[ \t]\$: ", + "\\.rb\$" => "^[\t ]*\$class\\|module\\|def\$ ", ); # ignore whitespaces for human readable diffs @@ -322,18 +341,29 @@ $mime_types = '/usr/local/etc/apache/mime.types'; "shtml" => "text/html", "gif" => "image/gif", "jpeg" => "image/jpeg", - "jpg" => "image/jpeg", + "jpg" => "image/jpeg", + "png" => "image/png", + "xpm" => "image/xpm", "*" => "text/plain", ); +# Charset for HTML output +$charset = ''; +# e.g. +#$charset = $where =~ m,/ru[/_-], ? 'koi8-r' +# : $where =~ m,/zh[/_-], ? 'big5' +# : $where =~ m,/ja[/_-], ? 'x-euc-jp' +# : $where =~ m,/ko[/_-], ? 'x-euc-kr' +# : 'iso-8859-1'; + ############## # Misc ############## # allow annotation of files # this requires rw-access to the -# CVSROOT/history - file and rw-access -# to the subdirectory to place the lock -# so you maybe don't want it +# CVSROOT/history file (if you have one) +# and rw-access to the subdirectory to +# place the lock so you maybe don't want it $allow_annotate = 1; # allow pretty-printed version of files @@ -343,7 +373,7 @@ $allow_markup = 1; # of output if the Browser accepts # it (HTTP_ACCEPT_ENCODING=gzip) # [make sure to have gzip in the path] -$allow_compress = 1; +$allow_compress = 0; # Make use of javascript functions. # This way you can select one of your CVSroot @@ -367,10 +397,6 @@ $open_extern_window = 1; # this allows editing of all your options more intuitive $edit_option_form = (not $dirtable); -# remember to set the path to your -# rcsutils: rlog, rcsdiff (gzip if you use compression) -#$ENV{'PATH'} = '/usr/local/bin'; - # If you have files which automatically refers to other files # (such as HTML) then this allows you to browse the checked # out files as if outside CVS. @@ -392,6 +418,13 @@ $markupLogColor = "#ffffff"; # Show CVS log when viewing file contents $show_log_in_markup = 1; +# Preformat when viewing file contents. This should be turned off +# when you have files in the repository that are in a multibyte +# encoding which uses HTML special characters ([<>&"]) as part of a +# multi-byte character. (such as iso-2022-jp, ShiftJIS, etc.) +# Otherwise those files will get screwed up in markup. +$preformat_in_markup = ''; + # Tabstop used to expand tabs in colored diffs. If undefined then # tabs are always expanded to 8 spaces. $tabstop = 8; @@ -408,4 +441,30 @@ $tabstop = 8; # server $use_moddate = 1; +# Allows downloading a tarball of the current directory if set. +# Bear in mind that this allows downloading a tarball of your entire +# repository, which can take a lot of time and disk space to create! +# If you enable this, you may need to make sure that cvsweb can write to +# CVSROOT/val-tags, due to a bug in cvs. +$allow_tar = ''; + +# Options to pass to tar(1). +@tar_options = qw(); +# e.g. @tar_options = qw(--ignore-failed-read); +# GNU tar has some useful options against unexpected errors. + +# Options to pass to gzip(1) when compressing a tarball to download. +@gzip_options = qw(); +# e.g. @gzip_options = qw(-3); +# Try lower compression level than 6 (default) if you want faster +# compression, or higher, for better compression. + +# Options to pass to cvs(1). +@cvs_options = qw(-l); + +push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD'); +# Only FreeBSD's and OpenBSD's cvs(1) supports -R (read only access +# mode) option, which considerably speeds up checkouts over NFS. + +1; #EOF