Merge remote-tracking branch 'gerrit/develop' into develop

1 files changed, 6 insertions, 4 deletions

diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 12c69a39..752993c1 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -10,8 +10,7 @@ class site_webapp {
   $webapp           = hiera('webapp')
   $api_version      = $webapp['api_version']
   $secret_token     = $webapp['secret_token']
-  $tor              = hiera('tor')
-  $hidden_service   = $tor['hidden_service']
+  $tor              = hiera('tor', false)
 
   Class['site_config::default'] -> Class['site_webapp']
 
@@ -159,8 +158,11 @@ class site_webapp {
       notify  => Service['apache'];
   }
 
-  if $hidden_service['active'] {
-    include site_webapp::hidden_service
+  if $tor {
+    $hidden_service = $tor['hidden_service']
+    if $hidden_service['active'] {
+      include site_webapp::hidden_service
+    }
   }
 
   include site_shorewall::webapp