diff options
author | Micah Anderson <micah@leap.se> | 2014-11-04 20:28:46 -0500 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-11-04 20:28:46 -0500 |
commit | 3e4d60bcd86b2a4373ff93bb5fd77570fa9ce91f (patch) | |
tree | 8c6aec84e289f6c4d2a472db95de07808667e88e /puppet/modules/site_webapp/manifests/init.pp | |
parent | 90b672ed58982b232b1c96febcd9736ae5fc4faf (diff) | |
parent | 16c985a1b8e692c0e0f76a30b7ec052c9dc269bd (diff) |
Merge remote-tracking branch 'gerrit/develop' into develop
Diffstat (limited to 'puppet/modules/site_webapp/manifests/init.pp')
-rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 17b010f3..12c69a39 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -10,6 +10,8 @@ class site_webapp { $webapp = hiera('webapp') $api_version = $webapp['api_version'] $secret_token = $webapp['secret_token'] + $tor = hiera('tor') + $hidden_service = $tor['hidden_service'] Class['site_config::default'] -> Class['site_webapp'] @@ -157,6 +159,10 @@ class site_webapp { notify => Service['apache']; } + if $hidden_service['active'] { + include site_webapp::hidden_service + } + include site_shorewall::webapp include site_check_mk::agent::webapp } |