/[adm]/puppet/modules/apache/templates/vhost_base.conf
ViewVC logotype

Diff of /puppet/modules/apache/templates/vhost_base.conf

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

revision 934 by misc, Tue Feb 1 12:44:56 2011 UTC revision 935 by misc, Tue Feb 1 12:45:03 2011 UTC
# Line 12  end Line 12  end
12          SSLCertificateKeyFile /etc/ssl/apache/<%= name %>.pem          SSLCertificateKeyFile /etc/ssl/apache/<%= name %>.pem
13  <%- end -%>  <%- end -%>
14          ServerName <%= real_vhost %>          ServerName <%= real_vhost %>
15    <%- server_aliases.each do |key| -%>
16            ServerAlias <%= key %>
17    <%- end -%>
18          DocumentRoot <%= location %>          DocumentRoot <%= location %>
19    
20  <%- if enable_public_html -%>  <%- if enable_public_html -%>

Legend:
Removed from v.934  
changed lines
  Added in v.935

  ViewVC Help
Powered by ViewVC 1.1.30