[tor-commits] [bridgedb/master] Update bridgedb.conf.

[isis at torproject.org]

commit 5c86df37fa1938508144bb52c971a3c31be0b310
Author: Isis Lovecruft <isis at torproject.org>
Date:   Sat Oct 26 10:16:46 2013 +0000

    Update bridgedb.conf.
    
     * REMOVE RUN_IN_DIR
     * CHANGE EXTRA_INFO_FILES to a list with the correct filenames.
     * CHANGE HTTPS options to bind to 127.0.0.1:6789 by default (for testing).
     * ADD missing HTTP_N_BRIDGES_PER_ANSWER option.
     * CHANGE to enabling bridge fingerprints by default.
     * CHANGE to GPG signing emails by default.
---
 bridgedb.conf |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index b565b37..88aa231 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -2,10 +2,6 @@
 #==========
 # General-purpose options.
 
-# We chdir to this directory when we start; all files with relative
-# pathnames are created under this directory
-RUN_IN_DIR = "~/run/"
-
 # Either a file in which to write our pid, or None
 PIDFILE = "bridgedb.pid"
 
@@ -34,16 +30,16 @@ STATUS_FILE = "networkstatus-bridges"
 
 # File from which we read extra-info entries, for learning pluggable
 # transports
-EXTRA_INFO_FILE = "extra-infos"
+EXTRA_INFO_FILES = ["cached-extrainfo", "cached-extrainfo.new"]
 
 # Only consider routers whose purpose matches this string.
 BRIDGE_PURPOSE = "bridge"
 # File to store persistent info in.
-DB_FILE = "./bridgedist.db"
+DB_FILE = "bridgedist.db"
 # File to log changes to persistent info in.  For debugging and bugfixing.
-DB_LOG_FILE = "./bridgedist.log"
+DB_LOG_FILE = "bridgedist.log"
 # File in which we store our secret HMAC root key.
-MASTER_KEY_FILE = "./secret_key"
+MASTER_KEY_FILE = "secret_key"
 
 # File to which we dump bridge pool assignments for statistics.
 ASSIGNMENTS_FILE = "assignments.log"
@@ -77,9 +73,9 @@ HTTPS_DIST = True
 HTTPS_SHARE=10
 # An IP address (form "1.2.3.4") where we listen for HTTPS connections.
 # "None" to listen on the default interface.
-HTTPS_BIND_IP=None
+HTTPS_BIND_IP='127.0.0.1'
 # Port to listen on for incoming HTTPS connections
-HTTPS_PORT=3443
+HTTPS_PORT=6789
 # Certificate file
 HTTPS_CERT_FILE="cert"
 # Private key file.
@@ -95,10 +91,11 @@ HTTP_UNENCRYPTED_PORT=None
 HTTP_USE_IP_FROM_FORWARDED_HEADER = False
 # How many bridges do we give back in an answer?
 HTTPS_N_BRIDGES_PER_ANSWER=3
+HTTP_N_BRIDGES_PER_ANSWER=3
 
 # Should we tell http users about the bridge fingerprints?  Turn this on
 # once we have the vidalia/tor interaction fixed for everbody.
-HTTPS_INCLUDE_FINGERPRINTS=False
+HTTPS_INCLUDE_FINGERPRINTS=True
 
 #==========
 # Options related to Email
@@ -147,11 +144,11 @@ EMAIL_N_BRIDGES_PER_ANSWER=3
 
 # Should we tell http users about the bridge fingerprints?  Turn this on
 # once we have the vidalia/tor interaction fixed for everbody.
-EMAIL_INCLUDE_FINGERPRINTS=False
+EMAIL_INCLUDE_FINGERPRINTS = True
 
 # Configuration options for GPG signed messages
-EMAIL_GPG_SIGNING_ENABLED = False
-EMAIL_GPG_SIGNING_KEY = ''
+EMAIL_GPG_SIGNING_ENABLED = True
+EMAIL_GPG_SIGNING_KEY = 'gnupghome/TESTING.subkeys.sec'
 
 #==========
 # Options related to unallocated bridges.