Reorganize tor config files in tor minimal test#1411
Reorganize tor config files in tor minimal test#1411stevenengler merged 2 commits intoshadow:devfrom
Conversation
Codecov Report
@@ Coverage Diff @@
## dev #1411 +/- ##
=======================================
Coverage 54.11% 54.12%
=======================================
Files 138 138
Lines 20438 20438
Branches 5163 5163
=======================================
+ Hits 11061 11062 +1
+ Misses 6463 6462 -1
Partials 2914 2914
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
2812d11 to
1ed10dd
Compare
robgjansen
left a comment
There was a problem hiding this comment.
This is great, thanks! Your reasons for keeping some of the Tor options in the shadow config make sense.
(Note that when setting up the structure for tornettools, we should include a middle and a guard or entry torrc files, and maybe remove the non-exit torrc; I could imagine wanting to configure something only on the guards but not the middles, and the non-exit torrc does not allow for that.)
One issue with doing it that ways is that there isn't really a way of specifying a relay as only a middle, since all relays (excluding exits, but that's a consensus setting and could technically change) will also be used as guards. |
This adds a
torrc-defaultsfile for each host in the template directory. These files includeconf/tor.common.torrcand one or more moreconf/tor.something.torrcfiles. Since the bandwidth values are the same for each host, they were moved intoconf/tor.common.torrc. This simplifies the Shadow config file.The Shadow config file still has some command line options such as
--Nickname exit2and--Bridge 100.0.0.1:9111that we could move into individualtorrcfiles for each host in the template directory, but I decided to leave them in the Shadow config since these options use values that are specified elsewhere in the Shadow config. For example theNicknameshould be the same as the Shadow host name, and theBridgeIP address should be the same as another host in the config file that specifiesip_address_hint.