opendev/system-config
Code Issues Proposed changes

Merge "Add rewrite rules for badges in the vhost config"

Browse Source
This commit is contained in:
Jenkins 2016-11-18 17:02:20 +00:00 committed by Gerrit Code Review
commit 8b7c572f02
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/openstack_project/templates/static-governance.vhost.erb
View File

@ -22,11 +22,18 @@
<% scope.lookupvar('openstack_project::static::governance_directories').each do |dirname| -%> <% scope.lookupvar('openstack_project::static::governance_directories').each do |dirname| -%>
<Directory <%= dirname %>> <Directory <%= dirname %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride FileInfo AllowOverride None
Satisfy Any Satisfy Any
Require all granted Require all granted
</Directory> </Directory>
<% end -%> <% end -%>
<Directory /srv/static/governance/badges>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Satisfy Any
Require all granted
ErrorDocument 404 /badges/project-unofficial.svg
</Directory>
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log
CustomLog /var/log/apache2/<%= @vhost_name %>_access.log combined CustomLog /var/log/apache2/<%= @vhost_name %>_access.log combined
@ -56,11 +63,18 @@
<% scope.lookupvar('openstack_project::static::governance_directories').each do |dirname| -%> <% scope.lookupvar('openstack_project::static::governance_directories').each do |dirname| -%>
<Directory <%= dirname %>> <Directory <%= dirname %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride FileInfo AllowOverride None
Satisfy Any Satisfy Any
Require all granted Require all granted
</Directory> </Directory>
<% end -%> <% end -%>
<Directory /srv/static/governance/badges>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Satisfy Any
Require all granted
ErrorDocument 404 /badges/project-unofficial.svg
</Directory>
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log
CustomLog /var/log/apache2/<%= @vhost_name %>_access.log combined CustomLog /var/log/apache2/<%= @vhost_name %>_access.log combined