summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorguido <guido@bruo.org>2014-11-06 12:45:32 -0300
committerguido <guido@bruo.org>2014-11-07 23:10:31 -0300
commit3ec9b173c092f1b582285c3e3573259d289c400e (patch)
tree4a7df0e7d14d12bfaa5d6797d9cae0a8cc8bf9cd /puppet/modules/site_webapp
parent16c985a1b8e692c0e0f76a30b7ec052c9dc269bd (diff)
Better check for tor hidden service on a webapp node.
Change-Id: I92f69b6fa30aae953243ae19096e2998810c9ac6
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp10
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