From 6612ee2ca885984c28525790faf6ec220c7aff34 Mon Sep 17 00:00:00 2001 From: RobHooper Date: Thu, 5 Nov 2026 11:48:17 +0000 Subject: [PATCH 1/2] feat: set disablereuse=On --- pillar/kingfisher_main.sls | 2 +- pillar/registry.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pillar/kingfisher_main.sls b/pillar/kingfisher_main.sls index 705fdf5d2..b66d2cbaa 100644 --- a/pillar/kingfisher_main.sls +++ b/pillar/kingfisher_main.sls @@ -106,7 +106,7 @@ apache: servername: collect.kingfisher.open-contracting.org context: documentroot: /home/collect/scrapyd - proxypass: http://localhost:6800/ + proxypass: http://localhost:6800/ disablereuse=On authname: Kingfisher Scrapyd pelican_frontend: configuration: pelican diff --git a/pillar/registry.sls b/pillar/registry.sls index 3c981e671..a3b9dbf05 100644 --- a/pillar/registry.sls +++ b/pillar/registry.sls @@ -66,7 +66,7 @@ apache: servername: collect.data.open-contracting.org context: documentroot: /home/collect/scrapyd - proxypass: http://localhost:6800/ + proxypass: http://localhost:6800/ disablereuse=On authname: Kingfisher Scrapyd registry: configuration: registry From b1cbacdd4aad2aee4e51d7d872da29a8909e85d8 Mon Sep 17 00:00:00 2001 From: RobHooper Date: Thu, 5 Nov 2026 11:48:41 +0000 Subject: [PATCH 2/2] feat: use journalctl for logging --- salt/core/systemd/files/scrapyd.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/salt/core/systemd/files/scrapyd.service b/salt/core/systemd/files/scrapyd.service index 8082b5c35..dd4559051 100644 --- a/salt/core/systemd/files/scrapyd.service +++ b/salt/core/systemd/files/scrapyd.service @@ -17,9 +17,10 @@ Environment="https_proxy={{ pillar.tinyproxy.url }}" Environment="no_proxy=localhost,sentry.io,open-contracting.org" {%- endif %} WorkingDirectory={{ entry.appdir }} -ExecStart={{ entry.appdir }}/.ve/bin/scrapyd --logfile=/var/log/scrapyd/scrapyd.log --pidfile= +ExecStart={{ entry.appdir }}/.ve/bin/scrapyd --pidfile= Restart=on-failure RestartSec=30 +LogFilterPatterns="~Pingdom" [Install] WantedBy=multi-user.target