opendev/system-config
Code Issues Proposed changes

Revert "Add cache-control headers for service-types.openstack.org"

Browse Source 
This reverts commit fc98399aa4e3837e74b4587df051e9c538fa1462.

Change-Id: Ie9562c096f865195bc44e55ea6425ad207d44e50
This commit is contained in:
Monty Taylor 2019-05-03 17:20:13 +00:00
parent 7fdd56dd0c
commit b415375f8b
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/openstack_project/manifests/static.pp
View File

@ -16,11 +16,6 @@ class openstack_project::static (
$ssl_chain_file_contents = '', $ssl_chain_file_contents = '',
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
$expires = {
'service-types.openstack.org' => {
'application/json' => 'access plus 1 week'
}
}
) { ) {
class { 'project_config': class { 'project_config':
url => $project_config_repo, url => $project_config_repo,
@ -68,12 +63,6 @@ class openstack_project::static (
httpd::mod { 'headers': ensure => present } httpd::mod { 'headers': ensure => present }
} }
if ! defined(Httpd::Mod['expires']) {
httpd::mod { 'expires':
ensure => present,
}
}
if ! defined(File['/srv/static']) { if ! defined(File['/srv/static']) {
file { '/srv/static': file { '/srv/static':
ensure => directory, ensure => directory,

6
modules/openstack_project/templates/static-https-redirect.vhost.erb
View File

@ -39,12 +39,6 @@
AllowOverrideList Redirect RedirectMatch AllowOverrideList Redirect RedirectMatch
Satisfy Any Satisfy Any
Require all granted Require all granted
<%- if scope.lookupvar('openstack_project::static::expires').has_key? @vhost_name -%>
ExpiresActive On
<%- scope.lookupvar('openstack_project::static::expires')[@vhost_name].each do |key,value| -%>
ExpiresByType <% key %> "<% value %>"
<%- end -%>
<%- end -%>
</Directory> </Directory>
LogLevel warn LogLevel warn
ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log