diff options
| author | varac <varacanero@zeromail.org> | 2015-11-05 21:13:31 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-11-17 19:51:11 +0100 |
| commit | 20dd8f27004a5dac0ad68113f4b8038cb34bc791 (patch) | |
| tree | ed0251e0b5b24220fb87ccb3baf9edb5e170497f /puppet/modules/site_webapp | |
| parent | 741bf02b5fabbba35b5cd34437b75eade5fe5dc4 (diff) | |
[bug] [jessie] Load needed modules for apache 2.4
- Related: #6920
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/apache.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/hidden_service.pp | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp index ddd04a91..80c7b29b 100644 --- a/puppet/modules/site_webapp/manifests/apache.pp +++ b/puppet/modules/site_webapp/manifests/apache.pp @@ -1,3 +1,4 @@ +# configure apache and passenger to serve the webapp class site_webapp::apache { $web_api = hiera('api') @@ -11,10 +12,10 @@ class site_webapp::apache { $webapp_domain = $webapp['domain'] include site_apache::common - include site_apache::module::headers - include site_apache::module::alias - include site_apache::module::expires - include site_apache::module::removeip + include apache::module::headers + include apache::module::alias + include apache::module::expires + include apache::module::removeip include site_webapp::common_vhost class { 'passenger': use_munin => false } diff --git a/puppet/modules/site_webapp/manifests/hidden_service.pp b/puppet/modules/site_webapp/manifests/hidden_service.pp index 99a756ca..4cf7a8ca 100644 --- a/puppet/modules/site_webapp/manifests/hidden_service.pp +++ b/puppet/modules/site_webapp/manifests/hidden_service.pp @@ -4,10 +4,10 @@ class site_webapp::hidden_service { $tor_domain = "${hidden_service['address']}.onion" include site_apache::common - include site_apache::module::headers - include site_apache::module::alias - include site_apache::module::expires - include site_apache::module::removeip + include apache::module::headers + include apache::module::alias + include apache::module::expires + include apache::module::removeip include tor::daemon tor::daemon::hidden_service { 'webapp': ports => '80 127.0.0.1:80' } |