diff options
| author | varac <varacanero@zeromail.org> | 2013-09-24 17:15:35 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-24 17:15:35 +0200 |
| commit | abb03cd19389188c38ccaeb96e3136cac5397563 (patch) | |
| tree | 7e19f0933b3eb79c179142d4d6ff2eba24116aae /puppet/modules | |
| parent | 02f17c426e6288f898a66a1a687b413ffe9a9b95 (diff) | |
https://bitmask.net/ca.crt gives 403 Forbidden (Bug #3919)
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index ff230417..e630875c 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -17,8 +17,7 @@ class site_webapp { include site_webapp::apache include site_webapp::couchdb include site_webapp::haproxy - include site_config::x509::cert - include site_config::x509::key + include site_config::x509::cert_key include site_config::x509::ca group { 'leap-webapp': @@ -75,7 +74,7 @@ class site_webapp { '/srv/leap/webapp/public/ca.crt': ensure => link, require => Vcsrepo['/srv/leap/webapp'], - target => '/usr/local/share/ca-certificates/leap_api.crt'; + target => "${x509::variables::local_CAs}/${site_config::params::ca_name}.crt"; "/srv/leap/webapp/public/${api_version}": ensure => directory, |