summaryrefslogtreecommitdiff
path: root/puppet/modules/site_tor
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2014-11-08 00:45:14 -0500
committerMicah Anderson <micah@leap.se>2014-11-08 00:45:14 -0500
commitfe23f66f0cff5af71c10aeefdbb0b1131d871219 (patch)
tree23b4469e59db1ea90090c210c5b32fff3531034b /puppet/modules/site_tor
parent180f32512a4c47444ea9e4f36d7376a894a83a4b (diff)
Only enable the tor DirPort options on an exit if the node isn't also a
webapp node (#6336) Change-Id: Ib70bbd8fe7b94b7a1bfb09390d5dd1c535f2da16
Diffstat (limited to 'puppet/modules/site_tor')
-rw-r--r--puppet/modules/site_tor/manifests/init.pp5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp
index 58f9e971..8f68a4e4 100644
--- a/puppet/modules/site_tor/manifests/init.pp
+++ b/puppet/modules/site_tor/manifests/init.pp
@@ -21,7 +21,10 @@ class site_tor {
}
if ( $tor_type == 'exit'){
- tor::daemon::directory { $::hostname: port => 80 }
+ # Only enable the daemon directory if the node isn't also a webapp node
+ if ! member($::services, 'webapp') {
+ tor::daemon::directory { $::hostname: port => 80 }
+ }
}
else {
include site_tor::disable_exit