=================================================================== RCS file: /cvs/cvsweb/cvsweb.cgi,v retrieving revision 4.3 retrieving revision 4.4 diff -u -p -r4.3 -r4.4 --- cvsweb/cvsweb.cgi 2019/11/09 09:11:55 4.3 +++ cvsweb/cvsweb.cgi 2019/11/09 09:19:27 4.4 @@ -1,5 +1,5 @@ #!/usr/bin/perl -T -# $Id: cvsweb.cgi,v 4.3 2019/11/09 09:11:55 schwarze Exp $ +# $Id: cvsweb.cgi,v 4.4 2019/11/09 09:19:27 schwarze Exp $ # $knu: cvsweb.cgi,v 1.299 2010/11/13 16:37:18 simon # # cvsweb - a CGI interface to CVS trees. @@ -88,7 +88,6 @@ use vars qw ( ); use Cwd qw(abs_path); -use File::Basename qw(dirname); use File::Path qw(rmtree); use File::Spec::Functions qw(canonpath catdir catfile curdir devnull rootdir tmpdir updir); @@ -204,22 +203,8 @@ sub checkout_to_temp($$$); # (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; +# Location of the configuration file inside the web server chroot: +$config = '/conf/cvsweb/cvsweb.conf'; ######## Configuration parameters #########