summaryrefslogtreecommitdiff
path: root/puppet/modules/site_tor
diff options
context:
space:
mode:
authorirregulator <irregulator@riseup.net>2014-03-12 03:20:54 +0200
committerirregulator <irregulator@riseup.net>2014-03-12 03:20:54 +0200
commit8d6b36eff5fcdd39bf1065eb481a0f98a6135696 (patch)
tree05c38b8367ef919c2957df9bf420252712abbb69 /puppet/modules/site_tor
parenta9f757f169611ce9ab65a6e0053e88fd744bfb7b (diff)
DirPortFrontPage serves a static webpage only when Tor node is exit.
See leap.se/code/issues/5241
Diffstat (limited to 'puppet/modules/site_tor')
-rw-r--r--puppet/modules/site_tor/manifests/init.pp15
1 files changed, 10 insertions, 5 deletions
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
+
}