aboutsummaryrefslogtreecommitdiff
path: root/torrc_templates
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2012-07-11 12:42:41 +0200
committerLinus Nordberg <linus@nordberg.se>2012-07-11 12:42:41 +0200
commit3ecad7d8587298c8efd642dd5ec5ba26f7000946 (patch)
treefad6f2e18d4511d19803fdb71de264f05fa95154 /torrc_templates
parent05355f80b8b461e665eb5e38508b247e716b94fc (diff)
downloadchutney-3ecad7d8587298c8efd642dd5ec5ba26f7000946.tar
chutney-3ecad7d8587298c8efd642dd5ec5ba26f7000946.tar.gz
Add support for bridge authorities, bridge relays and clients using bridges.
Diffstat (limited to 'torrc_templates')
-rw-r--r--torrc_templates/bridge.tmpl7
-rw-r--r--torrc_templates/bridgeauthority.tmpl6
-rw-r--r--torrc_templates/bridgeclient.tmpl5
-rw-r--r--torrc_templates/common.i2
4 files changed, 19 insertions, 1 deletions
diff --git a/torrc_templates/bridge.tmpl b/torrc_templates/bridge.tmpl
new file mode 100644
index 0000000..0c1a622
--- /dev/null
+++ b/torrc_templates/bridge.tmpl
@@ -0,0 +1,7 @@
+${include:common.i}
+SocksPort 0
+OrPort $orport
+Address $ip
+BridgeRelay 1
+ExitPolicy reject *:*
+
diff --git a/torrc_templates/bridgeauthority.tmpl b/torrc_templates/bridgeauthority.tmpl
new file mode 100644
index 0000000..5598069
--- /dev/null
+++ b/torrc_templates/bridgeauthority.tmpl
@@ -0,0 +1,6 @@
+${include:relay.tmpl}
+AuthoritativeDirectory 1
+ContactInfo bridgeauth${nodenum}@test.test
+ExitPolicy reject *:*
+
+BridgeAuthoritativeDir 1
diff --git a/torrc_templates/bridgeclient.tmpl b/torrc_templates/bridgeclient.tmpl
new file mode 100644
index 0000000..f414718
--- /dev/null
+++ b/torrc_templates/bridgeclient.tmpl
@@ -0,0 +1,5 @@
+${include:client.tmpl}
+UseBridges 1
+UseMicrodescriptors 0 # Microdescriptors don't work well with bridge clients
+${bridges}
+
diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 18e22d9..2b5e4fa 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -9,5 +9,5 @@ Log notice file ${dir}/notice.log
Log info file ${dir}/info.log
ProtocolWarnings 1
SafeLogging 0
-${dirservers}
+${authorities}