=================================================================== RCS file: /cvs/cvsweb/Attic/cvsweb.conf,v retrieving revision 3.3 retrieving revision 3.17 diff -u -p -r3.3 -r3.17 --- cvsweb/Attic/cvsweb.conf 2000/07/20 11:14:03 3.3 +++ cvsweb/Attic/cvsweb.conf 2001/01/02 23:34:46 3.17 @@ -6,7 +6,8 @@ # 1999 H. Nordstrom # 2000 A. MUSHA # based on work by Bill Fenner -# $Id: cvsweb.conf,v 3.3 2000/07/20 11:14:03 knu Exp $ +# $zId: cvsweb.conf,v 3.27 2000/07/27 10:16:39 kcoar Exp $ +# $Id: cvsweb.conf,v 3.17 2001/01/02 23:34:46 knu Exp $ # ### @@ -22,42 +23,47 @@ # 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"; +$mancgi = "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html"; ############## # Defaults for UserSettings @@ -90,7 +96,7 @@ $prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi"; # u Unified diff # c Context diff # s Side by side - "f" => "h", + "f" => "u", # hidecvsroot: Don't show the CVSROOT directory # 1 Hide CVSROOT directory @@ -99,7 +105,7 @@ $prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi"; # hidenonreadable: Don't show entries which cannot be read # 1 Hide non-readable entries - # 0 Show non-readble entries + # 0 Show non-readable entries "hidenonreadable" => "1", ); @@ -107,9 +113,12 @@ $prcgi = "http://www.FreeBSD.org/cgi/query-pr.cgi"; # 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 = '

'; @@ -119,10 +128,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'; @@ -142,7 +147,7 @@ display diffs between arbitrary revisions.

This script has been written by Bill Fenner -<fenner\@freebsd.org> +<fenner\@FreeBSD.org> and improved by Henner Zeller <zeller\@think.de>, Henrik Nordström @@ -159,11 +164,11 @@ If you would like to use this CGI script on your own w CVS tree, see Zeller's CVSweb distribution site. Bill's original script can be found -here. +here.

Please send any suggestions, comments, etc. to -Bill Fenner or, regarding the +Bill Fenner or, regarding the modifications, to Akinori MUSHA, Henner Zeller, @@ -187,12 +192,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 @@ -260,22 +267,23 @@ $use_descriptions = 0; # exceed the width of the browser $hr_breakable = 1; -# give out function names in human readable diffs +# give out function names in diffs # this just makes sense if we have C-files, otherwise # diff's heuristic doesn't work well .. # ( '-p' option to diff) -$hr_funout = 1; +$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. -%functionlineregexp = ( - "\\.(4th|fr)\$" => "\$^\\| \\|\t\$: ", - ); +%funcline_regexp = ( + "\\.(4th|fr)\$" => "\$^\\|[ \t]\$: ", + "\\.rb\$" => "^[\t ]*\$class\\|module\\|def\$ ", + ); # ignore whitespaces for human readable diffs # (indendation and stuff ..) # ( '-w' option to diff) -$hr_ignwhite = 1; +$hr_ignwhite = 0; # ignore diffs which are caused by # keyword-substitution like $Id - Stuff @@ -316,18 +324,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 @@ -337,7 +356,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 @@ -361,9 +380,11 @@ $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'; +# Set the path for the following commands: +# cvs, rlog, rcsdiff +# gzip (if you enable $allow_compress) +# tar,rm (if you enable $allow_tar) +$ENV{'PATH'} = '/bin:/usr/bin:/usr/local/bin'; # If you have files which automatically refers to other files # (such as HTML) then this allows you to browse the checked @@ -386,6 +407,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; @@ -402,4 +430,23 @@ $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 cvs(1). +@cvs_options = qw(-l); +# e.g. @cvs_options = qw(-R -l); +# -R (read only access mode) is implemented only in FreeBSD's and +# OpenBSD's cvs(1). + +1; #EOF