The host parameter to connect_to() is now const.

[privoxy.git] / config

diff --git a/config b/config
index df88bb3..4fa0a37 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for the Internet Junkbuster 2.0
 
 #
-# $Id: config,v 1.7 2001/05/29 09:50:24 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
@@ -183,35 +201,6 @@ forwardfile   ./forward
 #            listen-address    127.0.0.1:8000
 #
 
-#
-#  The 'tinygif' option lets you change how Junkbuster treats blocked
-#  images.  The default behavior is to send an HTML answer to requests
-#  for images, resulting in a "broken image icon" in place of the blocked
-#  image.  That's a little ugly, so several other options are available:
-#
-#     VALUE       EFFECT
-#     =====       ======
-#     0           Send HTML
-#     1           Send a GIF of one transparent pixel
-#     2           Send a GIF with the word "JUNKBUSTER"
-#     3 <url>     Send a redirect to the image indicated by the <url>
-#
-#  As an example of the last option:
-#
-#    tinygif 3 http://i.j.b/ijb-send-banner.gif
-#
-#  Will replace every blocked image with an image built into junkbuster.
-#
-#  There is one non-obvious benefit to using option "3".  If you use
-#  option 3, your Web browser will likely cache the image you specify
-#  on your local machine.  That means that after the first use, that
-#  image will load very quickly (and won't require a request to the
-#  junkbuster proxy)
-#
-#  Default: 0, i.e. send HTML
-#
-tinygif   2
-
 
 #
 #  The debug option sets the level of debugging information to log in
@@ -248,7 +237,8 @@ tinygif   2
 #
 #  Default: 0, i.e. log nothing but fatal errors
 #
-debug   1
+debug   1    # URLs
+debug   4096 # Info
 debug   8192 # Errors - *we highly recommended enabling this*
 
 #