diff options
author | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2015-07-23 11:46:55 -0400 |
commit | 70b1c648b94e6c007b9241a4661f33881e74485f (patch) | |
tree | 999e5dc1f386fc3894889c1cf263094cc748fd41 /puppet/modules/site_static | |
parent | b429b30bda4dafc78cb02f6ece5d82f08e35de1f (diff) | |
parent | 2761fa77394d5a2857812de840e49172d0e486fb (diff) |
Merge branch 'develop'
Diffstat (limited to 'puppet/modules/site_static')
-rw-r--r-- | puppet/modules/site_static/manifests/init.pp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp index ce79c00f..1efc510b 100644 --- a/puppet/modules/site_static/manifests/init.pp +++ b/puppet/modules/site_static/manifests/init.pp @@ -33,6 +33,9 @@ class site_static { include site_apache::module::expires include site_apache::module::removeip 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 @@ -43,8 +46,13 @@ class site_static { } if (member($formats, 'amber')) { - include site_config::ruby::dev - rubygems::gem{'amber-0.3.4': } + rubygems::gem{'amber-0.3.7': + require => Package['zlib1g-dev'] + } + + package { 'zlib1g-dev': + ensure => installed + } } create_resources(site_static::domain, $domains) @@ -52,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 +} |