Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260015
Change subject: tor: add a second relay running on the same server
......................................................................
tor: add a second relay running on the same server
Change-Id: Ie136f2a60f3a4ba99d142cfde2382ebab8923fe1
---
M manifests/role/tor.pp
1 file changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/260015/1
diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp
index ee3166a..60f692c 100644
--- a/manifests/role/tor.pp
+++ b/manifests/role/tor.pp
@@ -18,17 +18,28 @@
exit_policy => 'reject *:*', # no exits allowed
}
+ ::tor::instance { 'wikimediaeqiad2':
+ controlport => '9052',
+ controlpassword => $controlpassword,
+ orport => '9002',
+ dirport => '9032',
+ address => 'tor-eqiad-1.wikimedia.org',
+ nickname => 'wikimediaeqiad2',
+ contact => '[email protected]',
+ exit_policy => 'reject *:*', # no exits allowed
+ }
+
# actual Tor port where clients connect, public
ferm::service { 'tor_orport':
desc => 'port for the actual Tor client connections',
proto => 'tcp',
- port => '443',
+ port => '(443 9002)',
}
# for serving directory updates, public
ferm::service { 'tor_dirport':
desc => 'port advertising the directory service',
proto => 'tcp',
- port => '80',
+ port => '(80 9032)',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/260015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie136f2a60f3a4ba99d142cfde2382ebab8923fe1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
