X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=4fa0a3712fce1e92a1ef3b341f9ae9b0bd0107b3;hp=69cbbf0dd056e038943808f327fa366c56f8e4f7;hb=410a819a57f1deee21703f1cb0dd18b707a7adaa;hpb=40e34a50674c7e491bb8ac20635ff70d0b970f95

diff --git a/config b/config
index 69cbbf0d..4fa0a371 100644
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for the Internet Junkbuster 2.0
 
 #
-# $Id: config,v 1.8 2001/05/31 21:52:16 jongfoster Exp $
+# $Id: config,v 1.12 2001/06/04 10:44:57 swa Exp $
 #
 
 #  Table of Contents
@@ -61,7 +61,25 @@
 #  files in the current working directory.  In either case, an
 #  absolute path name can be used to avoid problems.
 
+# While we go modular and multiuser, the blocker, filter, and 
+# per-user config will be stored in subdirectories of confdir.
+# Now, only confdir/templates is used for storing HTML templates
+# for CGI results.
 #
+# No trailing /, please.
+confdir .
+
+#
+# The directory where all logging (i.e. logfile and jarfile) takes place
+# No trailing /, please.
+#
+logdir .
+
+#
+# Note that all file specifications below are relative to 
+# the above two directories!!!
+#
+
 #  The permissions file contains patterns to specify the
 #  filtering rules to apply to each site.
 #
@@ -70,7 +88,7 @@
 #           All sites are filtered if re_filterfile specified.
 #           No sites are blocked.  Nothing is an image.
 #
-permissionsfile ./permissionsfile
+permissionsfile permissionsfile
 
 #
 #  The re_filterfile contains content modification rules.  These rules
@@ -81,7 +99,7 @@ permissionsfile ./permissionsfile
 #
 #  Default: No content modification.
 #
-re_filterfile   ./re_filterfile
+re_filterfile   re_filterfile
 
 #
 #  The logfile is where all logging and error messages are written.
@@ -100,7 +118,7 @@ re_filterfile   ./re_filterfile
 #
 #  Default: Log to the standard error channel, not to a file
 #
-logfile      ./junkbuster.log
+logfile      logfile
 
 #
 #  The jarfile defines where Junkbuster stores the cookies it
@@ -109,7 +127,7 @@ logfile      ./junkbuster.log
 #
 #  Default: Don't store intercepted cookies
 #
-#jarfile     ./jarfile
+#jarfile     jarfile
 
 #
 #  The forwardfile defines domain-specific forwarding of HTTP
@@ -120,7 +138,7 @@ logfile      ./junkbuster.log
 #
 #  Default: Make all connections directly.
 #
-forwardfile   ./forward
+forwardfile   forward
 
 #
 #  Generally, Junkbuster is used as a personal proxy.  The default
@@ -138,7 +156,7 @@ forwardfile   ./forward
 #  Default: No access control. Everybody that can reach junkbuster
 #           will be served.
 #
-#aclfile   ./aclfile
+#aclfile   aclfile
 
 #
 #  4. OPTIONS