/[adm]/puppet/deployment/websites/manifests/init.pp
ViewVC logotype

Diff of /puppet/deployment/websites/manifests/init.pp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2102 by boklm, Tue Dec 20 14:06:41 2011 UTC revision 2103 by boklm, Tue Dec 20 14:14:46 2011 UTC
# Line 24  class websites { Line 24  class websites {
24      class www inherits base {      class www inherits base {
25          include apache::mod_php          include apache::mod_php
26          include apache::mod_geoip          include apache::mod_geoip
27            $vhost = "www-test.$domain"
28          $vhostdir = "$webdatadir/www.$domain"          $vhostdir = "$webdatadir/www.$domain"
29          $svn_location = "svn://svn.$domain/svn/web/www/trunk"          $svn_location = "svn://svn.$domain/svn/web/www/trunk"
30    
# Line 31  class websites { Line 32  class websites {
32              source => $svn_location              source => $svn_location
33          }          }
34    
35          apache::vhost_base { "www-test.$domain":          apache::vhost_base { "$vhost":
36                content => template('websites/vhost_www.conf'),
37                location => $vhostdir,
38                options => ['FollowSymLinks'],
39            }
40            apache::vhost_base { "ssl_$vhost":
41                use_ssl => true,
42                vhost => $vhost,
43              content => template('websites/vhost_www.conf'),              content => template('websites/vhost_www.conf'),
44              location => $vhostdir,              location => $vhostdir,
45              options => ['FollowSymLinks'],              options => ['FollowSymLinks'],
Legend:
Removed from v.2102  
changed lines
  Added in v.2103
  ViewVC Help
Powered by ViewVC 1.1.30