summaryrefslogtreecommitdiff
path: root/puppet/modules/site_static/manifests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-03-24 01:47:46 -0700
committerelijah <elijah@riseup.net>2014-03-24 01:47:46 -0700
commit51f320178a58d7a05860cfd8d6129a16cd4ca9d8 (patch)
tree0e45317adf8c862b12bb6b160b55f737a4c0eab9 /puppet/modules/site_static/manifests
parent482c3d5a77d05043f5276d4f19168d2b777d3ef0 (diff)
modules/site_static: part 2 - apache
Diffstat (limited to 'puppet/modules/site_static/manifests')
-rw-r--r--puppet/modules/site_static/manifests/domain.pp19
-rw-r--r--puppet/modules/site_static/manifests/init.pp4
2 files changed, 23 insertions, 0 deletions
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