From 24f0cc3c64aab59db436e0827ba24ec08023100a Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Sat, 24 May 2014 01:35:54 -0700
Subject: added support for /provider.json served from static site.

---
 puppet/modules/site_static/manifests/init.pp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'puppet/modules/site_static/manifests/init.pp')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 4f6d895f..6b2cc1f3 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -3,6 +3,24 @@ class site_static {
   $static        = hiera('static')
   $domains       = $static['domains']
   $formats       = $static['formats']
+  $bootstrap     = $static['bootstrap_files']
+
+  if $bootstrap['enabled'] {
+    $bootstrap_domain  = $bootstrap['domain']
+    $bootstrap_client  = $bootstrap['client_version']
+    file { '/srv/leap/provider.json':
+      content => $bootstrap['provider_json'],
+      owner   => 'www-data',
+      group => 'www-data',
+      mode => '0444';
+    }
+    # It is important to always touch provider.json: the client needs to check x-min-client-version header,
+    # but this is only sent when the file has been modified (otherwise 304 is sent by apache). The problem
+    # is that changing min client version won't alter the content of provider.json, so we must touch it.
+    exec { '/bin/touch /srv/leap/provider.json':
+      require => File['/srv/leap/provider.json'];
+    }
+  }
 
   if (member($formats, 'amber')) {
     include site_config::ruby::dev
-- 
cgit v1.2.3


From 4e3d168d103fea6476694997275c4df4821535f3 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Fri, 30 May 2014 14:52:26 -0700
Subject: static site: added rack support, added custom apache config

---
 puppet/modules/site_static/manifests/init.pp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'puppet/modules/site_static/manifests/init.pp')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 6b2cc1f3..6e347d35 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -11,8 +11,8 @@ class site_static {
     file { '/srv/leap/provider.json':
       content => $bootstrap['provider_json'],
       owner   => 'www-data',
-      group => 'www-data',
-      mode => '0444';
+      group   => 'www-data',
+      mode    => '0444';
     }
     # It is important to always touch provider.json: the client needs to check x-min-client-version header,
     # but this is only sent when the file has been modified (otherwise 304 is sent by apache). The problem
@@ -22,6 +22,21 @@ class site_static {
     }
   }
 
+  class { '::apache': no_default_site => true, ssl => true }
+  include site_apache::module::headers
+  include site_apache::module::alias
+  include site_apache::module::expires
+  include site_apache::module::removeip
+  include site_apache::module::rewrite
+
+  if (member($formats, 'rack')) {
+    include site_apt::preferences::passenger
+    class { 'passenger':
+      use_munin => false,
+      require => Class['site_apt::preferences::passenger']
+    }
+  }
+
   if (member($formats, 'amber')) {
     include site_config::ruby::dev
     rubygems::gem{'amber-0.3.0': }
-- 
cgit v1.2.3