Faidon Liambotis has submitted this change and it was merged.
Change subject: tor: drop tor_ prefix from all class variables
......................................................................
tor: drop tor_ prefix from all class variables
Change-Id: I6cd476598e0b39ae6365809e8ca1f175aa0f1cbf
---
M manifests/role/tor.pp
M modules/tor/manifests/init.pp
M modules/tor/templates/torrc.erb
3 files changed, 24 insertions(+), 24 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/tor.pp b/manifests/role/tor.pp
index 28e5384..ee3166a 100644
--- a/manifests/role/tor.pp
+++ b/manifests/role/tor.pp
@@ -8,14 +8,14 @@
$controlpassword = $passwords::tor::hashed_control_password
class { '::tor':
- tor_controlport => '9051',
- tor_controlpassword => $controlpassword,
- tor_orport => '443',
- tor_dirport => '80',
- tor_address => 'tor-eqiad-1.wikimedia.org',
- tor_nickname => 'wikimediaeqiad1',
- tor_contact => '[email protected]',
- tor_exit_policy => 'reject *:*', # no exits allowed
+ controlport => '9051',
+ controlpassword => $controlpassword,
+ orport => '443',
+ dirport => '80',
+ address => 'tor-eqiad-1.wikimedia.org',
+ nickname => 'wikimediaeqiad1',
+ contact => '[email protected]',
+ exit_policy => 'reject *:*', # no exits allowed
}
# actual Tor port where clients connect, public
diff --git a/modules/tor/manifests/init.pp b/modules/tor/manifests/init.pp
index c81230f..9350f25 100644
--- a/modules/tor/manifests/init.pp
+++ b/modules/tor/manifests/init.pp
@@ -1,13 +1,13 @@
# sets up a Tor relay
class tor (
- $tor_address,
- $tor_nickname,
- $tor_contact,
- $tor_controlpassword,
- $tor_controlport = '9051',
- $tor_orport = '443', # use 9001 if in use
- $tor_dirport = '80', # use 9030 if in use
- $tor_exit_policy = 'reject *:*',
+ $address,
+ $nickname,
+ $contact,
+ $controlpassword,
+ $controlport = '9051',
+ $orport = '443', # use 9001 if in use
+ $dirport = '80', # use 9030 if in use
+ $exit_policy = 'reject *:*',
) {
# tor itself
diff --git a/modules/tor/templates/torrc.erb b/modules/tor/templates/torrc.erb
index a51a85a..07dfe8c 100644
--- a/modules/tor/templates/torrc.erb
+++ b/modules/tor/templates/torrc.erb
@@ -9,31 +9,31 @@
SocksPort 0
## port for local connections from Tor controller
-ControlPort <%= @tor_controlport %>
+ControlPort <%= @controlport %>
## password for connections on the control port, generate hash with 'tor
--hash-password'
-HashedControlPassword <%= @tor_controlpassword %>
+HashedControlPassword <%= @controlpassword %>
## port for incoming Tor connections
-ORPort <%= @tor_orport %>
+ORPort <%= @orport %>
## if we have multiple NICs..
#OutboundBindAddress 10.0.0.5
## IP or DNS for incoming connections
-Address <%= @tor_address %>
+Address <%= @address %>
# mirror directory information ('please do if enough bandwidth')
-DirPort <%= @tor_dirport %>
+DirPort <%= @dirport %>
# this is what makes it a relay or an exit node
-ExitPolicy <%= @tor_exit_policy %>
+ExitPolicy <%= @exit_policy %>
# handle for the relay, so people don't have to refer to it by key.
-Nickname <%= @tor_nickname %>
+Nickname <%= @nickname %>
# admin mail contact
-ContactInfo <%= @tor_contact %>
+ContactInfo <%= @contact %>
# if we run more than one relay we should set this
# get it from /var/lib/tor/fingerprint
--
To view, visit https://gerrit.wikimedia.org/r/260012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6cd476598e0b39ae6365809e8ca1f175aa0f1cbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
