--- cvsweb-3.0.6/cvsweb.conf.fedora-config 2005-06-19 12:13:50.000000000 +0300 +++ cvsweb-3.0.6/cvsweb.conf 2006-01-09 00:34:39.000000000 +0200 @@ -24,7 +24,7 @@ # cvsgraph (if you enable $allow_graph) # enscript (if you enable $allow_enscript) # -@command_path = qw(/bin /usr/bin /usr/local/bin); +@command_path = qw(/bin /usr/bin); # Search the above directories for each command (prefer gtar over tar). # @@ -226,14 +226,14 @@ # check out the "mini" versions in the icons/ directory; they have a # width/height of 16/16. # -my $iconsdir = '/icons'; +my $iconsdir = '/icons/small'; # format: TEXT ICON-URL width height %ICONS = ( - back => [('[BACK]', "$iconsdir/back.gif", 20, 22)], - dir => [('[DIR]', "$iconsdir/dir.gif", 20, 22)], - file => [('[TXT]', "$iconsdir/text.gif", 20, 22)], - binfile => [('[BIN]', "$iconsdir/binary.gif", 20, 22)], + back => [('[BACK]', "$iconsdir/back.gif", 16, 16)], + dir => [('[DIR]', "$iconsdir/dir.gif", 16, 16)], + file => [('[TXT]', "$iconsdir/text.gif", 16, 16)], + binfile => [('[BIN]', "$iconsdir/binary.gif", 16, 16)], graph => [('[GRAPH]', "$iconsdir/minigraph.png", 16, 16)], ); undef $iconsdir; @@ -240,7 +240,7 @@ # An URL where to find the CSS. # -$cssurl = '/css/cvsweb.css'; +$cssurl = '/cvsweb/cvsweb.css'; # The length to which the last log entry should be truncated when shown # in the directory view. @@ -368,7 +368,7 @@ # The traditional mime.types file, eg. the one from Apache is fine. # See above where this gets used. # -$mime_types = '/usr/local/etc/apache/mime.types'; +$mime_types = '/etc/mime.types'; # Charset appended to the Content-Type HTTP header for text/* MIME types. # Note that the web server may default to some charset which may take effect @@ -518,7 +518,7 @@ # versions, the user account running CVSweb needs write access to # CVSROOT/val-tags. See also the tar, gzip and zip options below. # -#$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0; +$allow_tar = (($CMD{tar} && $CMD{gzip}) || $CMD{zip}) ? 1 : 0; # Options to pass to tar(1). # For example: @tar_options = qw(--ignore-failed-read); @@ -526,7 +526,7 @@ # Other useful options include "--owner=0" and "--group=0", see # the tar(1) (or gtar(1)) manpage for details. # -@tar_options = qw(); +@tar_options = qw(--owner=0 --group=0); # Options to pass to gzip(1) when compressing a tarball to download. # For example: @gzip_options = qw(-3); @@ -564,7 +564,7 @@ # To make annotate work against a read only repository, add -n, ie.: # @annotate_options = (@cvs_options, '-n'); # -@annotate_options = @cvs_options; +@annotate_options = (@cvs_options, '-n'); # Options to pass to rcsdiff(1). # Probably the only useful one here is -q (suppress diagnostic output). @@ -574,7 +574,7 @@ # Enables syntax highlighting using GNU Enscript if set. # You will need GNU Enscript version 1.6.3 or newer for this to work. # -#$allow_enscript = $CMD{enscript} ? 1 : 0; +$allow_enscript = $CMD{enscript} ? 1 : 0; # Options to pass to enscript(1). # Do not set the -q, --language, -o or --highlight options here. @@ -639,9 +639,9 @@ # Enable this to let CVSweb load extra configuration files from the "conf.d" # subdirectory of the directory this file is located in. This enables site # specific configuration without having to modify this "master" configuration -# file (except for enabling this functionality below :) +# file. # -if (0) { +if (1) { my $confdir = catdir(dirname(__FILE__), 'conf.d'); if (opendir(CONFD, $confdir)) { my @files = sort(map(catfile($confdir, $_), readdir(CONFD))); --- cvsweb-3.0.6/cvsweb.cgi.fedora-config 2005-09-25 23:28:51.000000000 +0300 +++ cvsweb-3.0.6/cvsweb.cgi 2006-01-09 00:33:32.000000000 +0200 @@ -208,22 +208,8 @@ # (think mod_perl)... delete(@ENV{qw(PATH IFS CDPATH ENV BASH_ENV)}); -my ($mydir) = (dirname($0) =~ /(.*)/); # untaint - -##### Start of Configuration Area ######## - -# == EDIT this == -# Locations to search for user configuration, in order: -for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') { - if (-r $_) { - $config = $_; - last; - } -} - -##### End of Configuration Area ######## - -undef $mydir; +# Path to the configuration file. +$config = '/etc/cvsweb/cvsweb.conf'; ######## Configuration parameters #########