Faidon Liambotis has submitted this change and it was merged.
Change subject: tor: update config file to remove default settings
......................................................................
tor: update config file to remove default settings
No reason to define e.g. User or RunAsDaemon, as these are included from
/usr/share/tor/tor-service-defaults-torrc anyway.
Change-Id: I88f4cfe507acf377965e89fb5741cf2644aad111
---
M modules/tor/templates/torrc.erb
1 file changed, 0 insertions(+), 14 deletions(-)
Approvals:
Faidon Liambotis: Verified; Looks good to me, approved
diff --git a/modules/tor/templates/torrc.erb b/modules/tor/templates/torrc.erb
index 816f43b..93d70c1 100644
--- a/modules/tor/templates/torrc.erb
+++ b/modules/tor/templates/torrc.erb
@@ -8,15 +8,6 @@
## do not open socks proxy by default, run as relay only
SocksPort 0
-## self-explaining
-RunAsDaemon 1
-
-## created by the distro package
-User debian-tor
-
-## log to its own file instead of syslog
-Log notice file /var/log/tor/tor.log
-
## port for local connections from Tor controller
ControlPort <%= @tor_controlport %>
@@ -31,11 +22,6 @@
## IP or DNS for incoming connections
Address <%= @tor_address %>
-
-## if we want to throttle
-#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps)
-#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
-## (there are also Accounting* options for traffic per day/week/month)
# mirror directory information ('please do if enough bandwidth')
DirPort <%= @tor_dirport %>
--
To view, visit https://gerrit.wikimedia.org/r/249990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I88f4cfe507acf377965e89fb5741cf2644aad111
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
