Bug: fix hidden service for static

hidden service should be activated iff tor is among the active services and
tor.hidden_service.active == true

puppet/modules/site_static/manifests/init.pp

@@ -12,6 +12,11 @@ class site_static {
   $formats        = $static['formats']
   $bootstrap      = $static['bootstrap_files']
   $tor            = hiera('tor', false)
+  if $tor and member($services, 'tor') and $tor['hidden_service']['active'] == true {
+    $tor_active = true
+  } else {
+    $tor_active = false
+  }
 
   file {
     '/srv/static/':
@@ -71,11 +76,13 @@ class site_static {
     }
   }
 
-  if $tor {
+  if $tor_active {
     $hidden_service = $tor['hidden_service']
     $tor_domain     = "${hidden_service['address']}.onion"
-      class { 'site_static::hidden_service': single_hop => $hidden_service['single_hop']
+    class { 'site_static::hidden_service':
+      single_hop => $hidden_service['single_hop']
     }
+
     # Currently, we only support a single hidden service address per server.
     # So if there is more than one domain configured, then we need to make sure
     # we don't enable the hidden service for every domain.

puppet/modules/site_static/templates/apache.conf.erb

@@ -74,7 +74,7 @@
   Require all granted
 </Directory>
 
-<%- if @tor && (@always_use_hidden_service || @use_hidden_service) -%>
+<%- if @tor_active && (@always_use_hidden_service || @use_hidden_service) -%>
 ##
 ## Tor
 ##