From 0876cc7c712f273991cbb1177d7416afd0a1462d Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 27 Nov 2012 11:49:08 -0500
Subject: add site_webapp class to install the certs/keys/CAs and virtual host
 configurations

---
 puppet/modules/site_webapp/manifests/apache.pp | 61 ++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 puppet/modules/site_webapp/manifests/apache.pp

(limited to 'puppet/modules/site_webapp/manifests/apache.pp')

diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
new file mode 100644
index 00000000..d6470186
--- /dev/null
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -0,0 +1,61 @@
+class site_webapp::apache {
+
+  $api_domain       = hiera('api_domain')
+  $x509             = hiera('x509')
+  $commercial_key   = $x509['commercial_key']
+  $commercial_cert  = $x509['commercial_cert']
+  $commercial_root  = $x509['commercial_ca_cert']
+  $api_key          = $x509['key']
+  $api_cert         = $x509['cert']
+  $api_root         = $x509['ca_cert']
+
+  $apache_no_default_site = true
+  include apache::ssl
+
+  apache::module {
+    'rewrite': ensure => present;
+    'headers': ensure => present;
+  }
+
+  class { 'passenger': use_munin => false }
+
+  apache::vhost::file {
+    'leap_webapp':
+      content => template('site_apache/vhosts.d/leap_webapp.conf.erb')
+  }
+
+  apache::vhost::file {
+    'api':
+      content => template('site_apache/vhosts.d/api.conf.erb')
+  }
+
+  x509::key {
+    'leap_webapp':
+      content => $commercial_key,
+      notify  => Service[apache];
+
+    'leap_api':
+      content => $api_key,
+      notify  => Service[apache];
+  }
+
+  x509::cert {
+    'leap_webapp':
+      content => $commercial_cert,
+      notify  => Service[apache];
+
+    'leap_api':
+      content => $api_cert,
+      notify  => Service[apache];
+  }
+
+  x509::ca {
+    'leap_webapp':
+      content => $commercial_root,
+      notify  => Service[apache];
+
+    'leap_api':
+      content => $api_root,
+      notify  => Service[apache];
+  }
+}
-- 
cgit v1.2.3


From e49f4038b9a5c6b8b0d3f0eed8735abf5ef54c0e Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Tue, 27 Nov 2012 14:40:10 -0500
Subject: map /1 -> document root

---
 puppet/modules/site_webapp/manifests/apache.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'puppet/modules/site_webapp/manifests/apache.pp')

diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index d6470186..8532cc38 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -13,6 +13,7 @@ class site_webapp::apache {
   include apache::ssl
 
   apache::module {
+    'alias':   ensure => present;
     'rewrite': ensure => present;
     'headers': ensure => present;
   }
-- 
cgit v1.2.3


From c3c23bbc27dee3fdcdf9aec6addcc816ad7b52ba Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 19 Dec 2012 12:12:16 -0800
Subject: webapp api now uses a customizable port (so that we don't try to rely
 on SNI for hosting two TLS domains on one IP).

---
 puppet/modules/site_webapp/manifests/apache.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'puppet/modules/site_webapp/manifests/apache.pp')

diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 8532cc38..554b9147 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -1,6 +1,9 @@
 class site_webapp::apache {
 
-  $api_domain       = hiera('api_domain')
+  $web_api          = hiera('api')
+  $api_domain       = $web_api['domain']
+  $api_port         = $web_api['port']
+
   $x509             = hiera('x509')
   $commercial_key   = $x509['commercial_key']
   $commercial_cert  = $x509['commercial_cert']
-- 
cgit v1.2.3