More config cleanup. Provide SetEnv for base path, and check all paths for

existance and readability (-d and -r). This closes Bug #863.

1 files changed, 45 insertions, 20 deletions

diff --git a/htdocs/config/validator.conf b/htdocs/config/validator.conf
index 3f0f2f4..8dff9ee 100644
--- a/htdocs/config/validator.conf
+++ b/htdocs/config/validator.conf
@@ -1,26 +1,61 @@
 #
 # Main Configuration File for the W3C Markup Validation Service.
 #
-# $Id: validator.conf,v 1.13 2004-09-03 01:26:33 link Exp $
+# $Id: validator.conf,v 1.14 2004-09-04 21:06:16 link Exp $
 #
 # See 'perldoc Config::General' for the syntax, and be aware that the
 # 'SplitPolicy' is 'equalsign', ie. keys and values are separated by '\s*=\s*'.
 #
 
 #
+# Base Path for Markup Validator files.
+#
+# You MUST set these unless you use the default locations for the files.
+# e.g. the config files in "/etc/w3c/" and everything else in
+# "/usr/local/validator/".
+#
+
+<Paths>
+  #
+  # Base path... (defaults to "/usr/local/validator").
+  #Base = /usr/local/validator
+
+  #
+  # Location of template files
+  Templates = $Base/share/templates/en_US
+
+  <SGML>
+    #
+    # The SGML Library Path.
+    Library = $Base/htdocs/sgml-lib
+
+    #
+    # The SGML Parser to use.  Defaults to /usr/bin/onsgmls.
+    Parser = /usr/bin/onsgmls
+  </SGML>
+</Paths>
+
+#
 # This controls whether the debugging options are allowed to be enabled. 
 Allow Debug = yes
 
 #
 # This lets you permanently enable the debugging options. Can be overridden
 # with CGI options (unlike "Allow Debug" above).
-Enable Debug  = no
+Enable Debug = no
 
 #
 # Whether private RFC1918 addresses are allowed.
 Allow Private IPs = no
 
 #
+# Protocols the validator is allowed to use for retrieving documents.
+# The default is to allow http and https.
+<Protocols>
+  Allow = data,http,https
+</Protocols>
+
+#
 # Email address of the maintainer of this service.
 Maintainer = www-validator@w3.org
 
@@ -32,29 +67,27 @@ Home Page = http://validator.w3.org/
 # Base URI for the Element Reference.
 Element Ref URI = http://www.htmlhelp.com/reference/html40/
 
-#
-# The SGML Library Path.
-SGML Library = /home/link/Work/w3.org/validator-HEAD/htdocs/sgml-lib
 
-#
-# The SGML Parser to use.  Defaults to /usr/bin/onsgmls.
-SGML Parser = /usr/bin/onsgmls
-
-#
-# Location of template files
-Template Path = /home/link/Work/w3.org/validator-HEAD/share/templates/en_US
 
 #
 # Mapping tables etc...
+#
 
+#
+# Maps element names to URLs (cf. "Element Ref URI" above).
 <Elements>
   Include eref.cfg
 </Elements>
 
+#
+# Main document Type Registry; contains all information on the types
+# of documents we support and how they are processed.
 <Types>
   Include types.conf
 </Types>
 
+#
+# Mapping of charset names to their IANA names and how iconv(3) knows them.
 <Charsets>
   Include charset.cfg
 </Charsets>
@@ -65,17 +98,9 @@ Template Path = /home/link/Work/w3.org/validator-HEAD/share/templates/en_US
   Include type.cfg
 </Types>
 
-
 #
 # Source for the "Tip of The Day" blurbs.
 <Tips>
   Include tips.cfg
 </Tips>
 
-
-#
-# Protocols the validator is allowed to use for retrieving documents.
-# The default is to allow http and https.
-<Protocols>
-  Allow = data,http,https
-</Protocols>