aboutsummaryrefslogtreecommitdiffstats
path: root/modules/blog
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-12 14:03:31 +0000
committerMichael Scherer <misc@mageia.org>2011-02-12 14:03:31 +0000
commite7185d87f94db582f2139ce8c026c06c1a00eb9a (patch)
tree7bcdd12e25cc312a8403087fc2efaf6a24aecebf /modules/blog
parentf9cb645186a7f504d1c8c4705f3c41a77230cdd3 (diff)
downloadpuppet-e7185d87f94db582f2139ce8c026c06c1a00eb9a.tar
puppet-e7185d87f94db582f2139ce8c026c06c1a00eb9a.tar.gz
puppet-e7185d87f94db582f2139ce8c026c06c1a00eb9a.tar.bz2
puppet-e7185d87f94db582f2139ce8c026c06c1a00eb9a.tar.xz
puppet-e7185d87f94db582f2139ce8c026c06c1a00eb9a.zip
- add ssl support on blog, and reuse the vhost_base module ( so there
is less template to write )
Diffstat (limited to 'modules/blog')
-rw-r--r--modules/blog/manifests/init.pp13
-rw-r--r--modules/blog/templates/blogs_vhosts.conf4
2 files changed, 11 insertions, 6 deletions
diff --git a/modules/blog/manifests/init.pp b/modules/blog/manifests/init.pp
index c430912f..893ee82d 100644
--- a/modules/blog/manifests/init.pp
+++ b/modules/blog/manifests/init.pp
@@ -33,8 +33,17 @@ class blog {
$blog_location = "/var/www/html/blog.$domain"
$blog_domain = "blog-test.$domain"
- apache::vhost_other_app { "$blog_domain":
- vhost_file => "blog/blogs_vhosts.conf",
+
+ apache::vhost_base { "$blog_domain":
+ location => $blog_location,
+ content => template('blog/blogs_vhosts.conf'),
+ }
+
+ apache::vhost_base { "ssl_$blog_domain":
+ use_ssl => true,
+ vhost => $blog_domain,
+ location => $blog_location,
+ content => template('blog/blogs_vhosts.conf'),
}
file { "$blog_location":
diff --git a/modules/blog/templates/blogs_vhosts.conf b/modules/blog/templates/blogs_vhosts.conf
index 86c2b7b7..b4a91396 100644
--- a/modules/blog/templates/blogs_vhosts.conf
+++ b/modules/blog/templates/blogs_vhosts.conf
@@ -1,6 +1,3 @@
-<VirtualHost *:80>
-ServerName <%= blog_domain %>
-DocumentRoot <%= blog_location %>
<Directory <%= blog_location %> >
Order deny,allow
Allow from All
@@ -8,4 +5,3 @@ DocumentRoot <%= blog_location %>
Options FollowSymlinks
Options +Indexes
</Directory>
-</VirtualHost>