summaryrefslogtreecommitdiff
path: root/manifests/ssl/base.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-04-17 15:32:01 -0400
committerMicah Anderson <micah@riseup.net>2015-04-17 15:32:01 -0400
commit36fd84c3d17355afa05b519764c37a3e45efc40d (patch)
treec6f5dbc4651875a147607c788b37c5c973573330 /manifests/ssl/base.pp
parentffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff)
parent8074127b8d8913314c90c3fe6131d078a858f7b6 (diff)
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'manifests/ssl/base.pp')
-rw-r--r--manifests/ssl/base.pp14
1 files changed, 11 insertions, 3 deletions
diff --git a/manifests/ssl/base.pp b/manifests/ssl/base.pp
index 7c17423..3f32913 100644
--- a/manifests/ssl/base.pp
+++ b/manifests/ssl/base.pp
@@ -1,7 +1,15 @@
-class apache::ssl::base {
- ::apache::config::include{ 'ssl_defaults.inc': }
+# basic defaults for ssl support
+class apache::ssl::base (
+) {
+ apache::config::include {
+ 'ssl_defaults.inc':
+ content => template('apache/include.d/ssl_defaults.inc.erb');
+ }
if !$apache::no_default_site {
- ::apache::vhost::file{ '0-default_ssl': }
+ apache::vhost::file{
+ '0-default_ssl':
+ content => template('apache/vhosts/0-default_ssl.conf.erb');
+ }
}
}