From 20ae86a8f4118a33c1c0697ad797fd21f9adc564 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Tue, 1 Jan 2019 13:22:43 +0000 Subject: [PATCH] logserver: set CORS header This change enables cross request to fetch job logs artifacts. Change-Id: I88ef4d559bb9b8fa3b67b51ec750bf9136a62ffb --- manifests/logserver.pp | 6 ++++++ templates/logs.vhost.erb | 3 +++ 2 files changed, 9 insertions(+) diff --git a/manifests/logserver.pp b/manifests/logserver.pp index e6367c1..3801ad1 100644 --- a/manifests/logserver.pp +++ b/manifests/logserver.pp @@ -45,6 +45,12 @@ class openstackci::logserver ( include ::httpd include ::httpd::mod::wsgi + if ! defined(Httpd::Mod['headers']) { + httpd::mod { 'headers': + ensure => present, + } + } + if ! defined(Httpd::Mod['rewrite']) { httpd::mod { 'rewrite': ensure => present, diff --git a/templates/logs.vhost.erb b/templates/logs.vhost.erb index afd3ae2..e51b275 100644 --- a/templates/logs.vhost.erb +++ b/templates/logs.vhost.erb @@ -13,6 +13,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> <% end -%> DocumentRoot <%= @docroot %> + # Authorize cross request, e.g. fetch job-output from the zuul builds page + Header set Access-Control-Allow-Origin "*" + WSGIDaemonProcess logs user=www-data group=www-data processes=<%= scope.lookupvar('::openstackci::logserver::wsgi_processes') %> threads=<%= scope.lookupvar('::openstackci::logserver::wsgi_threads') %> WSGIProcessGroup logs WSGIApplicationGroup %{GLOBAL}