From 51f320178a58d7a05860cfd8d6129a16cd4ca9d8 Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Mon, 24 Mar 2014 01:47:46 -0700
Subject: modules/site_static: part 2 - apache

---
 puppet/modules/site_static/manifests/domain.pp | 19 +++++++++++++++++++
 puppet/modules/site_static/manifests/init.pp   |  4 ++++
 2 files changed, 23 insertions(+)

(limited to 'puppet/modules/site_static/manifests')

diff --git a/puppet/modules/site_static/manifests/domain.pp b/puppet/modules/site_static/manifests/domain.pp
index 48284106..8af2230f 100644
--- a/puppet/modules/site_static/manifests/domain.pp
+++ b/puppet/modules/site_static/manifests/domain.pp
@@ -5,5 +5,24 @@ define site_static::domain (
   $cert,
   $tls_only) {
 
+  $domain = $name
+  $base_dir = '/srv/static'
+
   create_resources(site_static::location, $locations)
+
+  x509::cert { $domain: content => $cert }
+  x509::key  { $domain: content => $key }
+  x509::ca   { "${domain}_ca": content => $ca_cert }
+
+  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
+
+  apache::vhost::file { $domain:
+    content => template('site_static/apache.conf.erb')
+  }
+
 }
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index cc447cf7..91a4a7a9 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -10,4 +10,8 @@ class site_static {
   }
 
   create_resources(site_static::domain, $domains)
+
+  include site_shorewall::defaults
+  include site_shorewall::service::http
+  include site_shorewall::service::https
 }
\ No newline at end of file
-- 
cgit v1.2.3