Browse Source

Don't set DirPort on bridge relays

Closes #17088.
teor 5 years ago
parent
commit
8633713a88

+ 5 - 2
torrc_templates/bridge.tmpl

@@ -1,4 +1,7 @@
-${include:relay-non-exit.tmpl}
+${include:relay-non-dir.tmpl}
 
 BridgeRelay 1
-ExitPolicy reject *:*
+# Bridges don't have a DirPort
+DirPort 0
+# Nor do we have GEOIP files in any reliable location
+BridgeRecordUsageByCountry 0

+ 17 - 0
torrc_templates/relay-non-dir.tmpl

@@ -0,0 +1,17 @@
+${include:common.i}
+SocksPort 0
+OrPort $orport
+Address $ip
+
+# Must be included before exit-v{4,6}.i
+ExitRelay 0
+
+#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't
+#      help -- dl_stats.schedule is not DL_SCHED_CONSENSUS
+#      at boostrap time.
+# Try to download after:
+# the minimum initial consensus time to start with,
+# a few eager fetches,
+# then half the minimum testing consensus interval
+TestingServerDownloadSchedule 0, 5
+TestingServerConsensusDownloadSchedule 0, 5

+ 1 - 17
torrc_templates/relay-non-exit.tmpl

@@ -1,18 +1,2 @@
-${include:common.i}
-SocksPort 0
-OrPort $orport
-Address $ip
+${include:relay-non-dir.tmpl}
 DirPort $dirport
-
-# Must be included before exit-v{4,6}.i
-ExitRelay 0
-
-#NOTE: Setting TestingServerConsensusDownloadSchedule doesn't
-#      help -- dl_stats.schedule is not DL_SCHED_CONSENSUS
-#      at boostrap time.
-# Try to download after:
-# the minimum initial consensus time to start with,
-# a few eager fetches,
-# then half the minimum testing consensus interval
-TestingServerDownloadSchedule 0, 5
-TestingServerConsensusDownloadSchedule 0, 5