From fe23f66f0cff5af71c10aeefdbb0b1131d871219 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@leap.se>
Date: Sat, 8 Nov 2014 00:45:14 -0500
Subject: Only enable the tor DirPort options on an exit if the node isn't also
 a webapp node (#6336)

Change-Id: Ib70bbd8fe7b94b7a1bfb09390d5dd1c535f2da16
---
 puppet/modules/site_tor/manifests/init.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_tor/manifests/init.pp')

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
-- 
cgit v1.2.3