/[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 3046 by boklm, Sun Apr 14 14:38:33 2013 UTC revision 3047 by boklm, Sun Apr 14 14:58:03 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',                               'websites/vhost_www_rewrite.conf'),
                              'websites/vhost_proxy_mailman.conf'),  
28          location => $vhostdir,          location => $vhostdir,
29          options  => ['FollowSymLinks'],          options  => ['FollowSymLinks'],
30      }      }
# Line 34  class websites::www { Line 33  class websites::www {
33          use_ssl  => true,          use_ssl  => true,
34          vhost    => $vhost,          vhost    => $vhost,
35          content  => template('websites/vhost_www.conf',          content  => template('websites/vhost_www.conf',
36                               'websites/vhost_www_rewrite.conf',                               'websites/vhost_www_rewrite.conf'),
                              'websites/vhost_proxy_mailman_ssl.conf'),  
37          location => $vhostdir,          location => $vhostdir,
38          options  => ['FollowSymLinks'],          options  => ['FollowSymLinks'],
39      }      }
Legend:
Removed from v.3046  
changed lines
  Added in v.3047
  ViewVC Help
Powered by ViewVC 1.1.30