/[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 2717 by misc, Sun Mar 25 12:47:26 2012 UTC revision 2718 by boklm, Wed Apr 4 17:01:48 2012 UTC
# Line 21  class websites::www { Line 21  class websites::www {
21          mode   => '0660',          mode   => '0660',
22      }      }
23    
     $mailman_content = template('websites/vhost_www.conf',  
                                 'websites/vhost_proxy_mailman.conf')  
24      apache::vhost::base { $vhost:      apache::vhost::base { $vhost:
25          content  => $mailman_content,          content  => template('websites/vhost_www.conf',
26                                 'websites/vhost_proxy_mailman.conf'),
27          location => $vhostdir,          location => $vhostdir,
28          options  => ['FollowSymLinks'],          options  => ['FollowSymLinks'],
29      }      }
# Line 32  class websites::www { Line 31  class websites::www {
31      apache::vhost::base { "ssl_$vhost":      apache::vhost::base { "ssl_$vhost":
32          use_ssl  => true,          use_ssl  => true,
33          vhost    => $vhost,          vhost    => $vhost,
34          content  => $mailman_content,          content  => template('websites/vhost_www.conf',
35                                 'websites/vhost_proxy_mailman_ssl.conf'),
36          location => $vhostdir,          location => $vhostdir,
37          options  => ['FollowSymLinks'],          options  => ['FollowSymLinks'],
38      }      }
Legend:
Removed from v.2717  
changed lines
  Added in v.2718
  ViewVC Help
Powered by ViewVC 1.1.30