Added enable-edit-actions and enable-remote-toggle

[privoxy.git] / config

diff --git a/config b/config
index a33beb3..f1afd9b 100644 (file)
--- a/config
+++ b/config
@@ -1,7 +1,7 @@
 #  Sample Configuration file for the Internet Junkbuster 2.9.x
 
 #
-# $Id: config,v 1.20 2001/07/26 15:06:21 haroon Exp $
+# $Id: config,v 1.23 2001/10/21 20:25:20 steudten Exp $
 #
 
 #  Table of Contents
@@ -46,8 +46,6 @@
 #
 #  Long lines can be continued on the next line by using a `\' as
 #  the last character.
-#  
-
 #
 #  3. OTHER CONFIGURATION FILES
 #
@@ -75,10 +73,8 @@ confdir .
 #
 logdir .
 
-#
 #  Note that all file specifications below are relative to 
 #  the above two directories!!!
-#
 
 #  The actions file contains patterns to specify the
 #  actions to apply to requests for each site.
@@ -90,14 +86,13 @@ logdir .
 #
 actionsfile actionsfile
 
-#
 #  The re_filterfile contains content modification rules.  These rules
 #  permit powerful changes on the content of Web pages, e.g., you
 #  could disable your favourite JavaScript annoyances, rewrite the
 #  actual content, or just have some fun replacing "Microsoft"
 #  with "Microsuck" wherever it appears on a Web page.
 #
-#  Default: No content modification.
+#  Default: content modification. (see '+-filter' in actionsfile)
 #
 re_filterfile   re_filterfile
 
@@ -155,15 +150,12 @@ logfile      logfile
 trust-info-url http://www.your-site.com/why_we_block.html
 trust-info-url http://www.your-site.com/what_we_allow.html
 
-
-#
 #  4. OPTIONS
 #
 #  This part of the configuration file contains options that control
 #  how Junkbuster operates.
 #
 
-#
 #  Admin-address should be set to the email address of the proxy
 #  administrator. It is used in many of the proxy-generated pages.
 #
@@ -180,7 +172,7 @@ trust-info-url http://www.your-site.com/what_we_allow.html
 #
 #  Default: Don't show a link to online documentation
 #
-proxy-info-url http://www.your-site.com/proxy.html
+#proxy-info-url http://www.your-site.com/proxy.html
 
 #
 #  Listen-address specifies the address and port where Junkbuster will
@@ -269,7 +261,7 @@ debug   8192 # Errors - *we highly recommended enabling this*
 #
 #  Default: Multithreaded mode
 #
-single-threaded
+#single-threaded
 
 #
 #    'toggle' allows you to temporarily disable all Junkbuster's 
@@ -309,6 +301,36 @@ toggle 1
 #
 buffer-limit 4069
 
+
+#
+#  Enable the web-based actionsfile editor.  Set to 1 to enable,
+#  0 to disable.  Note that you must have compiled JunkBuster
+#  with support for this feature, otherwise this option has no
+#  effect.
+#
+#  Security note:  If this is enabled, anyone who can use the proxy
+#  can edit the actions file, and their changes will affect all users.
+#  For shared proxies, you probably want to disable this.
+#
+#  Default: Disabled
+#
+enable-edit-actions 1
+
+
+#
+#  Allow JunkBuster to be toggled on and off remotely, using your
+#  web browser.  Set to 1 to enable, 0 to disable.  Note that you
+#  must have compiled JunkBuster with support for this feature,
+#  otherwise this option has no effect.
+#
+#  Security note:  If this is enabled, anyone who can use the proxy
+#  can toggle it on or off, and their changes will affect all users.
+#  For shared proxies, you probably want to disable this.
+#
+#  Default: Disabled
+#
+enable-remote-toggle 1
+
 #############################################################################
 # Access Control List
 #############################################################################