From abb03cd19389188c38ccaeb96e3136cac5397563 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 24 Sep 2013 17:15:35 +0200
Subject: https://bitmask.net/ca.crt gives 403 Forbidden (Bug #3919)

---
 puppet/modules/site_webapp/manifests/init.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_webapp/manifests')

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,
-- 
cgit v1.2.3