Add more @ signs to meetbot vhost
Because puppet likes @ signs now. Change-Id: I1df8740ac27f8e5e4ba6c84e88f72ba8ef1edc69
This commit is contained in:
parent
09a9de6222
commit
bd8a9189c5
@ -2,30 +2,30 @@
|
|||||||
# Managed by Puppet
|
# Managed by Puppet
|
||||||
# ************************************
|
# ************************************
|
||||||
|
|
||||||
NameVirtualHost <%= vhost_name %>:<%= port %>
|
NameVirtualHost <%= @vhost_name %>:<%= @port %>
|
||||||
<VirtualHost <%= vhost_name %>:<%= port %>>
|
<VirtualHost <%= @vhost_name %>:<%= @port %>>
|
||||||
ServerName <%= srvname %>
|
ServerName <%= @srvname %>
|
||||||
<% if serveraliases.is_a? Array -%>
|
<% if @serveraliases.is_a? Array -%>
|
||||||
<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
|
<% @serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%>
|
||||||
<% elsif serveraliases != '' -%>
|
<% elsif @serveraliases != '' -%>
|
||||||
<%= " ServerAlias #{serveraliases}" %>
|
<%= " ServerAlias #{@serveraliases}" %>
|
||||||
<% end -%>
|
<% end -%>
|
||||||
DocumentRoot <%= docroot %>
|
DocumentRoot <%= @docroot %>
|
||||||
<FilesMatch \.log$>
|
<FilesMatch \.log$>
|
||||||
ForceType text/plain
|
ForceType text/plain
|
||||||
AddDefaultCharset UTF-8
|
AddDefaultCharset UTF-8
|
||||||
</FilesMatch>
|
</FilesMatch>
|
||||||
<Directory <%= docroot %>>
|
<Directory <%= @docroot %>>
|
||||||
Options <%= options %>
|
Options <%= @options %>
|
||||||
AllowOverride None
|
AllowOverride None
|
||||||
Order allow,deny
|
Order allow,deny
|
||||||
allow from all
|
allow from all
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
<%= vhost_extra %>
|
<%= @vhost_extra %>
|
||||||
|
|
||||||
ErrorLog /var/log/apache2/<%= name %>_error.log
|
ErrorLog /var/log/apache2/<%= @name %>_error.log
|
||||||
LogLevel warn
|
LogLevel warn
|
||||||
CustomLog /var/log/apache2/<%= name %>_access.log combined
|
CustomLog /var/log/apache2/<%= @name %>_access.log combined
|
||||||
ServerSignature Off
|
ServerSignature Off
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
Loading…
Reference in New Issue
Block a user