Faidon Liambotis has submitted this change and it was merged.
Change subject: tor: drop default parameter values
......................................................................
tor: drop default parameter values
Be more DRY and drop the default parameter values for the module, since
a) these are not the package's defaults, b) we were defining them in our
single call-site.
Change-Id: Ib9053fafb538026575b090bcef465c7a26a7a249
---
M modules/tor/manifests/init.pp
1 file changed, 7 insertions(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tor/manifests/init.pp b/modules/tor/manifests/init.pp
index 9350f25..0033802 100644
--- a/modules/tor/manifests/init.pp
+++ b/modules/tor/manifests/init.pp
@@ -1,27 +1,24 @@
# sets up a Tor relay
-class tor (
+class tor(
$address,
$nickname,
$contact,
+ $controlport,
$controlpassword,
- $controlport = '9051',
- $orport = '443', # use 9001 if in use
- $dirport = '80', # use 9030 if in use
- $exit_policy = 'reject *:*',
- ) {
+ $orport,
+ $dirport,
+ $exit_policy,
+) {
- # tor itself
package { 'tor':
ensure => 'present',
}
- # status monitor for tor
- # https://www.atagar.com/arm/
+ # status monitor for tor - https://www.atagar.com/arm/
package { 'tor-arm':
ensure => 'present',
}
- # main config file
file { '/etc/tor/torrc':
ensure => 'present',
mode => '0444',
--
To view, visit https://gerrit.wikimedia.org/r/260013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9053fafb538026575b090bcef465c7a26a7a249
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
