opendev/system-config
Code Issues Proposed changes

Add more @ signs to logs-dev and status vhosts

Browse Source 
To make puppet more happy.

Change-Id: I22755ef7d7772b2dbf68b0663985785f50767d14
This commit is contained in:
James E. Blair 2014-09-12 10:43:55 -07:00
parent bd8a9189c5
commit fcf7b069c1
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/openstack_project/templates/logs-dev.vhost.erb
View File

@ -3,15 +3,15 @@
# 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 %>
# use Apache to compress the results afterwards, to save on the wire # use Apache to compress the results afterwards, to save on the wire
# it's approx 18x savings of wire traffic to compress. We need to # it's approx 18x savings of wire traffic to compress. We need to
@ -23,37 +23,37 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
AddDefaultCharset UTF-8 AddDefaultCharset UTF-8
AddEncoding x-gzip gz AddEncoding x-gzip gz
</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>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/> <Directory <%= @docroot %>/periodic*/*/*-tempest-dsvm*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
# old patterns, can be removed in July 2014 # old patterns, can be removed in July 2014
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*>
ReadmeName /help/tempest-overview.html ReadmeName /help/tempest-overview.html
</Directory> </Directory>
<Directory <%= docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/*/*/*/*/gate-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
<Directory <%= docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/> <Directory <%= @docroot %>/periodic/*/periodic-tempest-devstack*/*/logs/>
ReadmeName /help/tempest-logs.html ReadmeName /help/tempest-logs.html
</Directory> </Directory>
@ -76,8 +76,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
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>

24
modules/openstack_project/templates/status.vhost.erb
View File

@ -2,15 +2,15 @@
# 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 %>
Alias /bugday /srv/static/bugdaystats Alias /bugday /srv/static/bugdaystats
<Directory /srv/static/bugdaystats> <Directory /srv/static/bugdaystats>
@ -28,8 +28,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
Alias /release /srv/static/release Alias /release /srv/static/release
<Directory <%= docroot %>> <Directory <%= @docroot %>>
Options <%= options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
@ -54,8 +54,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
</Directory> </Directory>
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>