diff options
| author | Micah Anderson <micah@leap.se> | 2014-11-07 21:14:01 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-11-07 21:14:01 -0500 |
| commit | d62f07ab408c6ff4d9d28a452c855ee6ed6cd758 (patch) | |
| tree | 2b4cc92f1a0e38e0b9944d38910b995289c27167 | |
| parent | d0658888a0af6b06b03fd172306ea3f346c50081 (diff) | |
| parent | 3ec9b173c092f1b582285c3e3573259d289c400e (diff) | |
Merge remote-tracking branch 'gerrit/develop' into develop
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 10 |
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 |