opendev
/
puppet-meetbot
Code Issues Proposed changes

Add more @ signs to meetbot vhost 

Because puppet likes @ signs now.

Change-Id: I1df8740ac27f8e5e4ba6c84e88f72ba8ef1edc69
This commit is contained in:
James E. Blair 2014-09-12 10:26:56 -07:00
parent 7cf8168049
commit 40abbdad88
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
templates/vhost.erb
View File

@ -2,30 +2,30 @@
# Managed by Puppet
# ************************************
NameVirtualHost <%= vhost_name %>:<%= port %>
<VirtualHost <%= vhost_name %>:<%= port %>>
ServerName <%= srvname %>
<% if serveraliases.is_a? Array -%>
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif serveraliases != '' -%>
<%= " ServerAlias #{serveraliases}" %>
NameVirtualHost <%= @vhost_name %>:<%= @port %>
<VirtualHost <%= @vhost_name %>:<%= @port %>>
ServerName <%= @srvname %>
<% if @serveraliases.is_a? Array -%>
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
<% elsif @serveraliases != '' -%>
<%= " ServerAlias #{@serveraliases}" %>
<% end -%>
DocumentRoot <%= docroot %>
DocumentRoot <%= @docroot %>
<FilesMatch \.log$>
ForceType text/plain
AddDefaultCharset UTF-8
</FilesMatch>
<Directory <%= docroot %>>
Options <%= options %>
<Directory <%= @docroot %>>
Options <%= @options %>
AllowOverride None
Order allow,deny
allow from all
</Directory>
<%= vhost_extra %>
<%= @vhost_extra %>
ErrorLog /var/log/apache2/<%= name %>_error.log
ErrorLog /var/log/apache2/<%= @name %>_error.log
LogLevel warn
CustomLog /var/log/apache2/<%= name %>_access.log combined
CustomLog /var/log/apache2/<%= @name %>_access.log combined
ServerSignature Off
</VirtualHost>