client ca -- configure the webapp with the client ca

3 files changed, 27 insertions, 0 deletions

diff --git a/puppet/modules/site_webapp/manifests/client_ca.pp b/puppet/modules/site_webapp/manifests/client_ca.pp
new file mode 100644
index 00000000..53c49d69
--- /dev/null
+++ b/puppet/modules/site_webapp/manifests/client_ca.pp
@@ -0,0 +1,24 @@
+##
+## This is for the special CA that is used exclusively for generating
+## client certificates by the webapp.
+##
+
+class site_webapp::client_ca {
+  include x509::variables
+
+  $x509 = hiera('x509')
+  $cert_path = "${x509::variables::certs}/leap_client_ca.crt"
+  $key_path = "${x509::variables::keys}/leap_client_ca.key"
+
+  x509::key {
+    'leap_client_ca':
+      source => $x509['client_ca_key'],
+      notify  => Service[apache];
+  }
+
+  x509::cert {
+    'leap_client_ca':
+      source => $x509['client_ca_cert'],
+      notify  => Service[apache];
+  }
+}
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index f7c6565e..717a9477 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -16,6 +16,7 @@ class site_webapp {
   include rubygems
   include site_webapp::apache
   include site_webapp::couchdb
+  include site_webapp::client_ca
 
   group { 'leap-webapp':
     ensure    => present,
diff --git a/puppet/modules/site_webapp/templates/config.yml.erb b/puppet/modules/site_webapp/templates/config.yml.erb
index 5e223a58..9cf85f0c 100644
--- a/puppet/modules/site_webapp/templates/config.yml.erb
+++ b/puppet/modules/site_webapp/templates/config.yml.erb
@@ -1,3 +1,5 @@
 production:
   admins: [admin]
   domain: <%= @provider_domain %>
+  client_ca_key: <%= scope.lookupvar('site_webapp::client_ca::key_path') %>
+  client_ca_cert: <%= scope.lookupvar('site_webapp::client_ca::cert_path') %>