1 --- cvsweb-3.0.1.new/cvsweb.cgi 2004-08-19 14:06:58.000000000 +0200
2 +++ cvsweb-3.0.6/cvsweb.cgi 2007-10-06 15:27:43.849021395 +0300
6 # Locations to search for user configuration, in order:
7 -for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
8 +my ($CVSWEB_CONFIG) = $1 if $ENV{CVSWEB_CONFIG} =~ /(.*)/; # untaint
9 +for ($CVSWEB_CONFIG, catfile($mydir, 'cvsweb.conf'), '/etc/webapps/cvsweb/cvsweb.conf') {
13 --- cvsweb-3.0.1/cvsweb.conf 2004-05-05 01:40:50.000000000 +0200
14 +++ cvsweb-3.0.1.new/cvsweb.conf 2004-08-19 14:08:34.000000000 +0200
16 # cvsgraph (if you enable $allow_graph)
17 # enscript (if you enable $allow_enscript)
19 -@command_path = qw(/bin /usr/bin /usr/local/bin);
20 +@command_path = qw(/bin /usr/bin);
22 # Search the above directories for each command (prefer gtar over tar).
25 # 'symbolic_name' => ['Name to display', '/path/to/cvsroot']
28 - 'local' => ['Local Repository', '/var/cvs'],
29 + 'local' => ['Local Repository', '/home/services/cvsroot'],
30 # 'freebsd' => ['FreeBSD', '/var/ncvs'],
31 # 'openbsd' => ['OpenBSD', '/var/ncvs'],
32 # 'netbsd' => ['NetBSD', '/var/ncvs'],
36 #$cvstreedefault = $CVSrepositories[2 * 0];
37 -#$cvstreedefault = 'local';
38 +$cvstreedefault = 'local';
40 # Bug tracking system linking options ("PR" means Problem Report, as in GNATS)
43 # Manual gateway linking.
46 - "http://www.FreeBSD.org/cgi/man.cgi?apropos=0&sektion=%s&query=%s&manpath=FreeBSD+5.0-current&format=html";
47 + "http://linux.die.net/man/%s/%s";
49 # Defaults for user options.
52 # check out the "mini" versions in the icons/ directory; they have a
53 # width/height of 16/16.
55 -my $iconsdir = '/icons';
56 +my $iconsdir = '/cvsweb/icons';
58 # format: TEXT ICON-URL width height
62 # An URL where to find the CSS.
64 -$cssurl = '/css/cvsweb.css';
65 +$cssurl = '/cvsweb/css/cvsweb.css';
67 # The length to which the last log entry should be truncated when shown
68 # in the directory view.
70 # The traditional mime.types file, eg. the one from Apache is fine.
71 # See above where this gets used.
73 -$mime_types = '/usr/local/etc/apache/mime.types';
74 +$mime_types = '/etc/mime.types';
76 # Charset appended to the Content-Type HTTP header for text/* MIME types.
77 # Note that the web server may default to some charset which may take effect
79 # settings in the configuration file with command line options, see
80 # doGraph() and doGraphView() in cvsweb.cgi for details.
82 -#$cvsgraph_config = "/etc/cvsgraph.conf";
83 +#$cvsgraph_config = "/etc/cvsgraph/cvsgraph.conf";
85 # URL to the CVSHistory script. This should be absolute (but does not need
86 # to include the host and port if the script is on the same server as
88 'nroff' => qr/\.man$/o,
89 'pascal' => qr/\.p(as|p)?$/io,
90 'perl' => qr/\.p(m|(er)?l)$/io,
91 + 'php' => qr/\.php$/io,
92 'postscript' => qr/\.e?ps$/io,
93 'python' => qr/\.py$/o,
94 'rfc' => qr/\b((rfc|draft)\..*\.txt)$/o,