--- puppet/deployment/websites/manifests/init.pp 2011/12/20 14:06:41 2102 +++ puppet/deployment/websites/manifests/init.pp 2011/12/20 14:14:46 2103 @@ -24,6 +24,7 @@ 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 @@ 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'],