aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/websites
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-12-20 14:14:46 +0000
committerNicolas Vigier <boklm@mageia.org>2011-12-20 14:14:46 +0000
commitcda6626175deafeeae1f90c4c156b42f6ffaf23b (patch)
tree15f8d45f45b5831479aaa341476b54f96401211d /deployment/websites
parent893942fd0b9a9764b1e14e61504ee5762a1b651d (diff)
downloadpuppet-cda6626175deafeeae1f90c4c156b42f6ffaf23b.tar
puppet-cda6626175deafeeae1f90c4c156b42f6ffaf23b.tar.gz
puppet-cda6626175deafeeae1f90c4c156b42f6ffaf23b.tar.bz2
puppet-cda6626175deafeeae1f90c4c156b42f6ffaf23b.tar.xz
puppet-cda6626175deafeeae1f90c4c156b42f6ffaf23b.zip
add www with ssl
Diffstat (limited to 'deployment/websites')
-rw-r--r--deployment/websites/manifests/init.pp10
1 files changed, 9 insertions, 1 deletions
diff --git a/deployment/websites/manifests/init.pp b/deployment/websites/manifests/init.pp
index 15ac5812..34593b1a 100644
--- a/deployment/websites/manifests/init.pp
+++ b/deployment/websites/manifests/init.pp
@@ -24,6 +24,7 @@ class websites {
class www inherits base {
include apache::mod_php
include apache::mod_geoip
+ $vhost = "www-test.$domain"
$vhostdir = "$webdatadir/www.$domain"
$svn_location = "svn://svn.$domain/svn/web/www/trunk"
@@ -31,7 +32,14 @@ class websites {
source => $svn_location
}
- apache::vhost_base { "www-test.$domain":
+ apache::vhost_base { "$vhost":
+ content => template('websites/vhost_www.conf'),
+ location => $vhostdir,
+ options => ['FollowSymLinks'],
+ }
+ apache::vhost_base { "ssl_$vhost":
+ use_ssl => true,
+ vhost => $vhost,
content => template('websites/vhost_www.conf'),
location => $vhostdir,
options => ['FollowSymLinks'],