summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorville <ville@localhost>2005-07-21 21:12:19 +0000
committerville <ville@localhost>2005-07-21 21:12:19 +0000
commit371b701e25dcc067f343660266f0d3fe2656f32e (patch)
tree36f800e429bb8abf49de0471f4c14ba05b45617c
parent390a16f28bcedb984de3a412482e464c6dc9177e (diff)
downloadmarkup-validator-371b701e25dcc067f343660266f0d3fe2656f32e.zip
markup-validator-371b701e25dcc067f343660266f0d3fe2656f32e.tar.gz
markup-validator-371b701e25dcc067f343660266f0d3fe2656f32e.tar.bz2
Simplify, rephrase and sync default paths with validator.conf and "check".
-rw-r--r--httpd/conf/httpd.conf30
1 files changed, 11 insertions, 19 deletions
diff --git a/httpd/conf/httpd.conf b/httpd/conf/httpd.conf
index d2b9def..9974a0c 100644
--- a/httpd/conf/httpd.conf
+++ b/httpd/conf/httpd.conf
@@ -3,32 +3,24 @@
# Note that this is not a complete server configuration file, but contains
# only the validator-specific part.
#
-# You may use the Include directive for including this in your main httpd.conf.
+# You can use the Include directive for including this in your main httpd.conf.
#
-# $Id: httpd.conf,v 1.25 2005-07-20 13:26:02 ville Exp $
-#
-
# The values below assume that you have the validator files in
-# /usr/share/w3c-markup-validator. If not, tune them according to your setup.
-
+# /usr/local/validator. If not, tune them according to your setup.
+#
# Note: running the validator under mod_perl is not supported at the moment.
-# This is the directory where you have the validator's "check"
-# script as well as its and *.html, *.css etc files.
+# First, tell httpd that check and sendfeedback.pl are CGI scripts.
-Alias /w3c-validator/ "/usr/share/w3c-markup-validator/htdocs/"
-ScriptAlias /w3c-validator/feedback "/usr/share/w3c-markup-validator/httpd/cgi-bin/sendfeedback.pl"
-ScriptAlias /w3c-validator/feedback.html "/usr/share/w3c-markup-validator/httpd/cgi-bin/sendfeedback.pl"
+ScriptAlias /w3c-validator/check /usr/local/validator/cgi-bin/check
+ScriptAliasMatch /w3c-validator/feedback(\.html)? /usr/local/validator/cgi-bin/sendfeedback.pl
-<Directory /usr/share/w3c-markup-validator/htdocs>
- Options ExecCGI IncludesNOEXEC Indexes MultiViews
+# This is the directory where you have the validator's *.html, *.css etc files.
+
+Alias /w3c-validator/ /usr/local/validator/htdocs/
+<Directory /usr/local/validator/htdocs/>
+ Options IncludesNOEXEC Indexes MultiViews
AllowOverride None
AddHandler server-parsed .html
AddCharset utf-8 .html
</Directory>
-
-# Tell httpd that "check" is a CGI script.
-
-<Location "/w3c-validator/check">
- SetHandler cgi-script
-</Location>