diff options
| author | elijah <elijah@riseup.net> | 2015-04-17 10:24:37 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2015-04-17 10:24:37 -0700 |
| commit | f3aa928a91e0172a7a3c940940ab864194cb85a7 (patch) | |
| tree | 433c2784c878301dcc36478e32496b9140d4a407 /puppet/modules/site_webapp/manifests/init.pp | |
| parent | 8bd7eca1913a8ca23e8b2c92b83aeac5a665131b (diff) | |
| parent | 64cc83793aa35b84b60dd40305c7edf8369a187b (diff) | |
Merge branch 'bugfix/logs' into develop
Diffstat (limited to 'puppet/modules/site_webapp/manifests/init.pp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index ea64048b..ec94c090 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -18,7 +18,6 @@ class site_webapp { include site_config::ruby::dev include site_webapp::apache include site_webapp::couchdb - include site_webapp::logging include site_haproxy include site_webapp::cron include site_config::x509::cert @@ -93,10 +92,6 @@ class site_webapp { require => Vcsrepo['/srv/leap/webapp'], owner => leap-webapp, group => leap-webapp, mode => '0644'; - # old provider.json location. this can be removed after everyone upgrades. - '/srv/leap/webapp/public/provider.json': - ensure => absent; - '/srv/leap/webapp/public/ca.crt': ensure => link, require => Vcsrepo['/srv/leap/webapp'], @@ -173,6 +168,8 @@ class site_webapp { ensure => latest, } + leap::logfile { 'webapp': } + include site_shorewall::webapp include site_check_mk::agent::webapp } |