From b59c6e0a760681ea9f4bb661138a76dba9d218c7 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 13 Oct 2023 12:39:17 -0300 Subject: [PATCH] Update config for fcgi - CGIPassAuth Remove empty break line --- images/web/config/production.conf | 12 ++---------- values.staging.template.yaml | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/images/web/config/production.conf b/images/web/config/production.conf index 77c5d04d..730ffe30 100644 --- a/images/web/config/production.conf +++ b/images/web/config/production.conf @@ -19,7 +19,7 @@ RewriteRule .* https://www.%{HTTP_HOST}%{REQUEST_URI} [L,R=301] - CGIPassAuth On + CGIPassAuth Off # ======Proxying traffic to CGImap==== @@ -32,15 +32,7 @@ RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] RewriteRule ^/api/0\.6/(way|relation)/[0-9]+/full(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] RewriteRule ^/api/0\.6/(nodes|ways|relations)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] - RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] - - # - # Redirect non-api requests made to api.openhistoricalmap.org to www.openhistoricalmap.org - # Testing - # - # RewriteCond %{HTTP_HOST} ^api\. - # RewriteCond %{REQUEST_URI} !^/api/ - # RewriteRule ^(.*)$ https://staging.openhistoricalmap.org$1 [L,NE,R=permanent] + # RewriteRule ^/api/0\.6/changeset/[0-9]+/(upload|download)(\.json|\.xml)?$ fcgi://127.0.0.1:8000$0 [P] # Relax Apache security settings diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 27e605e2..1a78fbce 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -105,7 +105,6 @@ osm-seed: serviceAnnotations: service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300" env: - MAILER_ADDRESS: {{MAILER_ADDRESS}} MAILER_DOMAIN: staging.openhistoricalmap.org MAILER_USERNAME: {{MAILER_USERNAME}}