diff options
| author | Micah Anderson <micah@leap.se> | 2014-03-12 15:32:08 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-03-12 15:32:08 -0400 |
| commit | cb5c812d9f0ea19ee54e75c6b20029c302dbb655 (patch) | |
| tree | 54806fab23228790cfeb46db52be542319d86619 /puppet/modules/site_tor | |
| parent | ad7e96cd1e95080e7ddfee766f131056094bfc0d (diff) | |
| parent | 507391adf853ea39daac4772143fc5aa4abef47b (diff) | |
Merge remote-tracking branch 'irregulator/bug/5241' into 0.6
Diffstat (limited to 'puppet/modules/site_tor')
| -rw-r--r-- | puppet/modules/site_tor/manifests/init.pp | 15 |
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..02368a0e 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 + } |