From 3c4c973a44a57a115de2f9a3e8bc67f0b74af3d1 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 17 Jun 2015 15:11:11 -0700
Subject: bugfix: site_static module was not including ssl_common.inc

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

(limited to 'puppet/modules/site_static')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index ce79c00f..35ecabf8 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -33,6 +33,7 @@ class site_static {
   include site_apache::module::expires
   include site_apache::module::removeip
   include site_apache::module::rewrite
+  apache::config::include{ 'ssl_common.inc': }
 
   if (member($formats, 'rack')) {
     include site_apt::preferences::passenger
-- 
cgit v1.2.3


From a845c11183a0ee29776c70def63f2d27aaeb653c Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 24 Jun 2015 16:44:34 -0700
Subject: remove static site circular dependency (closes #7145)

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

(limited to 'puppet/modules/site_static')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 35ecabf8..2a198b57 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -35,6 +35,8 @@ class site_static {
   include site_apache::module::rewrite
   apache::config::include{ 'ssl_common.inc': }
 
+  include site_config::ruby::dev
+
   if (member($formats, 'rack')) {
     include site_apt::preferences::passenger
     class { 'passenger':
@@ -44,7 +46,6 @@ class site_static {
   }
 
   if (member($formats, 'amber')) {
-    include site_config::ruby::dev
     rubygems::gem{'amber-0.3.4': }
   }
 
-- 
cgit v1.2.3


From 1109121d575653cb08e807ddcd68b737743d404d Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@leap.se>
Date: Sun, 5 Jul 2015 15:21:57 +0200
Subject: zlib1g-dev needed for amber gem fixes #7231

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

(limited to 'puppet/modules/site_static')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 2a198b57..e37d5ad2 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -46,6 +46,9 @@ class site_static {
   }
 
   if (member($formats, 'amber')) {
+    package { 'zlib1g-dev':
+      ensure => installed
+    }
     rubygems::gem{'amber-0.3.4': }
   }
 
@@ -54,4 +57,4 @@ class site_static {
   include site_shorewall::defaults
   include site_shorewall::service::http
   include site_shorewall::service::https
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From 1e872b71382f94f9c2d63ccbcaa43ca7d6741b42 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Thu, 9 Jul 2015 12:18:03 -0700
Subject: use latest amber for static nodes.

---
 puppet/modules/site_static/manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'puppet/modules/site_static')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 2a198b57..1e7317a0 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -46,7 +46,7 @@ class site_static {
   }
 
   if (member($formats, 'amber')) {
-    rubygems::gem{'amber-0.3.4': }
+    rubygems::gem{'amber-0.3.7': }
   }
 
   create_resources(site_static::domain, $domains)
-- 
cgit v1.2.3


From c5f1790602b2a987f7cfb18b0da8e11e692cdd40 Mon Sep 17 00:00:00 2001
From: kwadronaut <kwadronaut@autistici.org>
Date: Tue, 14 Jul 2015 13:55:49 +0000
Subject: bump amber version, taking care of puppet ordering with require.

---
 puppet/modules/site_static/manifests/init.pp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'puppet/modules/site_static')

diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index e37d5ad2..a3fd9c1e 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -46,10 +46,13 @@ class site_static {
   }
 
   if (member($formats, 'amber')) {
+    rubygems::gem{'amber-0.3.7':  
+       require =>  Package['zlib1g-dev']
+     }
+
     package { 'zlib1g-dev':
-      ensure => installed
+        ensure => installed
     }
-    rubygems::gem{'amber-0.3.4': }
   }
 
   create_resources(site_static::domain, $domains)
@@ -57,4 +60,4 @@ class site_static {
   include site_shorewall::defaults
   include site_shorewall::service::http
   include site_shorewall::service::https
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3