From 8d6b36eff5fcdd39bf1065eb481a0f98a6135696 Mon Sep 17 00:00:00 2001
From: irregulator <irregulator@riseup.net>
Date: Wed, 12 Mar 2014 03:20:54 +0200
Subject: DirPortFrontPage serves a static webpage only when Tor node is exit.
 See leap.se/code/issues/5241

---
 puppet/modules/site_tor/manifests/init.pp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'puppet/modules/site_tor')

diff --git a/puppet/modules/site_tor/manifests/init.pp b/puppet/modules/site_tor/manifests/init.pp
index b6e73a23..28bc5240 100644
--- a/puppet/modules/site_tor/manifests/init.pp
+++ b/puppet/modules/site_tor/manifests/init.pp
@@ -19,12 +19,17 @@ class site_tor {
     my_family        => '$2A431444756B0E7228A7918C85A8DACFF7E3B050',
   }
 
-  tor::daemon::directory { $::hostname: port => 80 }
-
-  include site_shorewall::tor
-
-  if ( $tor_type != 'exit' ) {
+  if ( $tor_type == 'exit'){
+    tor::daemon::directory { $::hostname: port => 80 }
+  }
+  else {
+    tor::daemon::directory { $::hostname:
+      port => 80,
+      port_front_page => '';
+    }
     include site_tor::disable_exit
   }
 
+  include site_shorewall::tor
+
 }
-- 
cgit v1.2.3