Browse Source

Create Exit and Non-Exit Authority and Bridge Authority Templates

Refactor existing templates to avoid duplication.

This makes flagging each exit for performance testing much easier.
teor 7 years ago
parent
commit
9f9b12f1f6

+ 2 - 0
torrc_templates/authority-exit.tmpl

@@ -0,0 +1,2 @@
+${include:relay.tmpl}
+${include:authority.i}

+ 40 - 0
torrc_templates/authority.i

@@ -0,0 +1,40 @@
+AuthoritativeDirectory 1
+V3AuthoritativeDirectory 1
+ContactInfo auth${nodenum}@test.test
+
+# Speed up the consensus cycle as fast as it will go
+# Voting Interval can be:
+#   10, 12, 15, 18, 20, 24, 25, 30, 36, 40, 45, 50, 60, ...
+# Testing Initial Voting Interval can be:
+#    5,  6,  8,  9, or any of the possible values for Voting Interval,
+# as they both need to evenly divide 30 minutes.
+# If clock desynchronisation is an issue, use an interval of at least:
+#   18 * drift in seconds, to allow for a clock slop factor
+TestingV3AuthInitialVotingInterval 5
+V3AuthVotingInterval 10
+# VoteDelay + DistDelay must be less than VotingInterval
+TestingV3AuthInitialVoteDelay 2
+V3AuthVoteDelay 2
+TestingV3AuthInitialDistDelay 2
+V3AuthDistDelay 2
+# This is autoconfigured by chutney, so you probably don't want to use it
+#TestingV3AuthVotingStartOffset 0
+
+# Work around situations where the Exit, Guard and HSDir flags aren't being set
+# These flags are all set eventually, but it takes Guard up to ~30 minutes
+# We could be more precise here, but it's easiest just to vote everything
+# Clients are sensible enough to filter out Exits without any exit ports,
+# and Guards and HSDirs without ORPorts
+# If your tor doesn't recognise TestingDirAuthVoteExit/HSDir,
+# either update your chutney to a 2015 version,
+# or update your tor to a later version, most likely 0.2.6.2-final
+
+# These are all set in common.i in the Comprehensive/Rapid sections
+# Work around Exit requirements
+#TestingDirAuthVoteExit *
+# Work around bandwidth thresholds for exits
+#TestingMinExitFlagThreshold 0
+# Work around Guard uptime requirements
+#TestingDirAuthVoteGuard *
+# Work around HSDir uptime and ORPort connectivity requirements
+#TestingDirAuthVoteHSDir *

+ 1 - 42
torrc_templates/authority.tmpl

@@ -1,43 +1,2 @@
 ${include:relay-non-exit.tmpl}
-
-AuthoritativeDirectory 1
-V3AuthoritativeDirectory 1
-ContactInfo auth${nodenum}@test.test
-ExitPolicy reject *:*
-
-# Speed up the consensus cycle as fast as it will go
-# Voting Interval can be:
-#   10, 12, 15, 18, 20, 24, 25, 30, 36, 40, 45, 50, 60, ...
-# Testing Initial Voting Interval can be:
-#    5,  6,  8,  9, or any of the possible values for Voting Interval,
-# as they both need to evenly divide 30 minutes.
-# If clock desynchronisation is an issue, use an interval of at least:
-#   18 * drift in seconds, to allow for a clock slop factor
-TestingV3AuthInitialVotingInterval 5
-V3AuthVotingInterval 10
-# VoteDelay + DistDelay must be less than VotingInterval
-TestingV3AuthInitialVoteDelay 2
-V3AuthVoteDelay 2
-TestingV3AuthInitialDistDelay 2
-V3AuthDistDelay 2
-# This is autoconfigured by chutney, so you probably don't want to use it
-#TestingV3AuthVotingStartOffset 0
-
-# Work around situations where the Exit, Guard and HSDir flags aren't being set
-# These flags are all set eventually, but it takes Guard up to ~30 minutes
-# We could be more precise here, but it's easiest just to vote everything
-# Clients are sensible enough to filter out Exits without any exit ports,
-# and Guards and HSDirs without ORPorts
-# If your tor doesn't recognise TestingDirAuthVoteExit/HSDir,
-# either update your chutney to a 2015 version,
-# or update your tor to a later version, most likely 0.2.6.2-final
-
-# These are all set in common.i in the Comprehensive/Rapid sections
-# Work around Exit requirements
-#TestingDirAuthVoteExit *
-# Work around bandwidth thresholds for exits
-#TestingMinExitFlagThreshold 0
-# Work around Guard uptime requirements
-#TestingDirAuthVoteGuard *
-# Work around HSDir uptime and ORPort connectivity requirements
-#TestingDirAuthVoteHSDir *
+${include:authority.i}

+ 2 - 0
torrc_templates/bridgeauthority-exit.tmpl

@@ -0,0 +1,2 @@
+${include:relay.tmpl}
+${include:bridgeauthority.i}

+ 3 - 0
torrc_templates/bridgeauthority.i

@@ -0,0 +1,3 @@
+AuthoritativeDirectory 1
+BridgeAuthoritativeDir 1
+ContactInfo bridgeauth${nodenum}@test.test

+ 1 - 5
torrc_templates/bridgeauthority.tmpl

@@ -1,6 +1,2 @@
 ${include:relay-non-exit.tmpl}
-AuthoritativeDirectory 1
-ContactInfo bridgeauth${nodenum}@test.test
-ExitPolicy reject *:*
-
-BridgeAuthoritativeDir 1
+${include:bridgeauthority.i}