Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: wdqs: multiple fixes - Create rules.log as a symlink to a file
in /var - drop cookies when proxying request
......................................................................
wdqs: multiple fixes
- Create rules.log as a symlink to a file in /var
- drop cookies when proxying request
Change-Id: I9301d74e1540057b2f9c730214a28015ef5ba0f1
---
M modules/wdqs/manifests/init.pp
M modules/wdqs/templates/nginx.erb
2 files changed, 10 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/wdqs/manifests/init.pp b/modules/wdqs/manifests/init.pp
index dfa91eb..bf7804b 100644
--- a/modules/wdqs/manifests/init.pp
+++ b/modules/wdqs/manifests/init.pp
@@ -42,6 +42,14 @@
require => User[$username],
}
+ # Blazegraph tries to log to this file, redirect to log dir
+ file { "${package_dir}/rules.log":
+ ensure => link,
+ target => "${log_dir}/rules.log",
+ require => [ File[$package_dir], File[$log_dir] ],
+ before => Service['wdqs-blazegraph'],
+ }
+
# If we have data in separate dir, make link in package dir
if $data_dir != $package_dir {
file { $data_dir:
diff --git a/modules/wdqs/templates/nginx.erb b/modules/wdqs/templates/nginx.erb
index b9553f1..11f805b 100644
--- a/modules/wdqs/templates/nginx.erb
+++ b/modules/wdqs/templates/nginx.erb
@@ -35,6 +35,8 @@
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-BIGDATA-MAX-QUERY-MILLIS 30000;
+ # drop cookies
+ proxy_set_header Cookie "";
add_header Access-Control-Allow-Origin *;
--
To view, visit https://gerrit.wikimedia.org/r/229150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9301d74e1540057b2f9c730214a28015ef5ba0f1
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
