From: schwarze@mandoc.bsd.lv
To: source@mandoc.bsd.lv
Subject: cvsweb: merge rev.
Date: Sat, 9 Nov 2019 04:19:58 -0500 (EST) [thread overview]
Message-ID: <8d07681e13fc23e2@mandoc.bsd.lv> (raw)
Log Message:
-----------
merge rev. 3.119.2.12:
A web server should absolutely run chrooted, so storing a configuration
file below /usr/local/etc/ makes no sense whatsoever. Also, the
configuration file should certainly not be in a directory where
files can get executed as CGI scripts, so looking in the same
directory as cvsweb.cgi is a bad idea, too.
Considerably simplify things by hardcoding a reasonable location.
The INSTALL file already instructs the user to check this.
Modified Files:
--------------
cvsweb:
cvsweb.cgi
Revision Data
-------------
Index: cvsweb.cgi
===================================================================
RCS file: /home/cvs/mandoc/cvsweb/cvsweb.cgi,v
retrieving revision 4.3
retrieving revision 4.4
diff -Lcvsweb.cgi -Lcvsweb.cgi -u -p -r4.3 -r4.4
--- cvsweb.cgi
+++ cvsweb.cgi
@@ -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 #########
--
To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv
next reply other threads:[~2019-11-09 9:19 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 9:19 schwarze [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-12 9:28 schwarze
2019-11-10 16:00 schwarze
2019-11-09 9:27 schwarze
2019-11-09 9:24 schwarze
2019-11-09 9:12 schwarze
2019-11-09 9:10 schwarze
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8d07681e13fc23e2@mandoc.bsd.lv \
--to=schwarze@mandoc.bsd.lv \
--cc=source@mandoc.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).