summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static
diff options
context:
space:
mode:
authorMicah Anderson <micah@leap.se>2015-07-21 15:55:41 -0400
committerMicah Anderson <micah@leap.se>2015-07-21 15:55:41 -0400
commitcdadd9c1c26efd61c98a810206a06ce5b7302701 (patch)
tree7d2b67ae8f014f0bac9d8b941398bee90790913a /puppet/modules/site_static
parent21af45fd2156e16786e3476c779115662ecb72a7 (diff)
parentc5f1790602b2a987f7cfb18b0da8e11e692cdd40 (diff)
Merge remote-tracking branch 'kwadrolab/static-amber-7231' into develop
Conflicts: puppet/modules/site_static/manifests/init.pp Change-Id: I090b1cb3cbe3c4d01a2c640ae3a370b17e722e12
Diffstat (limited to 'puppet/modules/site_static')
-rw-r--r--puppet/modules/site_static/manifests/init.pp10
1 files changed, 8 insertions, 2 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 1e7317a0..1efc510b 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -46,7 +46,13 @@ class site_static {
}
if (member($formats, 'amber')) {
- rubygems::gem{'amber-0.3.7': }
+ rubygems::gem{'amber-0.3.7':
+ require => Package['zlib1g-dev']
+ }
+
+ package { 'zlib1g-dev':
+ ensure => installed
+ }
}
create_resources(site_static::domain, $domains)
@@ -54,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
+}