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

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

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

revision 3045 by boklm, Mon Dec 10 19:54:47 2012 UTC revision 3046 by boklm, Sun Apr 14 14:38:33 2013 UTC
# Line 24  class websites::www { Line 24  class websites::www {
24    
25      apache::vhost::base { $vhost:      apache::vhost::base { $vhost:
26          content  => template('websites/vhost_www.conf',          content  => template('websites/vhost_www.conf',
27                                 'websites/vhost_www_rewrite.conf',
28                               'websites/vhost_proxy_mailman.conf'),                               'websites/vhost_proxy_mailman.conf'),
29          location => $vhostdir,          location => $vhostdir,
30          options  => ['FollowSymLinks'],          options  => ['FollowSymLinks'],
# Line 33  class websites::www { Line 34  class websites::www {
34          use_ssl  => true,          use_ssl  => true,
35          vhost    => $vhost,          vhost    => $vhost,
36          content  => template('websites/vhost_www.conf',          content  => template('websites/vhost_www.conf',
37                                 'websites/vhost_www_rewrite.conf',
38                               'websites/vhost_proxy_mailman_ssl.conf'),                               'websites/vhost_proxy_mailman_ssl.conf'),
39          location => $vhostdir,          location => $vhostdir,
40          options  => ['FollowSymLinks'],          options  => ['FollowSymLinks'],

Legend:
Removed from v.3045  
changed lines
  Added in v.3046

  ViewVC Help
Powered by ViewVC 1.1.30