From 9d487272cd6522d3db9a75cdf5008a071f8cff12 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 11 Jan 2024 16:18:27 -0500 Subject: [PATCH 1/3] Add embed_server_url and disable taginfo - staging --- images/web/config/settings.yml | 1 + values.staging.template.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/images/web/config/settings.yml b/images/web/config/settings.yml index 90bfae37..173f3db8 100644 --- a/images/web/config/settings.yml +++ b/images/web/config/settings.yml @@ -146,3 +146,4 @@ min_changeset_comments_per_hour: 1 initial_changeset_comments_per_hour: 6 max_changeset_comments_per_hour: 60 moderator_changeset_comments_per_hour: 36000 +embed_server_url: "https://embed.openhistoricalmap.org/" diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 2739f9f3..7c51ef80 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -649,7 +649,7 @@ osm-seed: # Variables for taginfo # ==================================================================================================== taginfo: - enabled: true + enabled: false nodeSelector: enabled: false label_key: nodegroup_type From 26e75327d59c34288848c67063d2a9cb91e18174 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 11 Jan 2024 16:52:00 -0500 Subject: [PATCH 2/3] Disable nominatim -staging --- values.staging.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 7c51ef80..0ed30bc7 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -567,7 +567,7 @@ osm-seed: # Variables for nominatim api # ==================================================================================================== nominatimApi: - enabled: true + enabled: false serviceAnnotations: service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300" replicaCount: 1 From 50676db55ce8d54194945cfd4e87e45429b8cc8c Mon Sep 17 00:00:00 2001 From: Dan Rademacher Date: Wed, 17 Jan 2024 21:14:35 -0800 Subject: [PATCH 3/3] pull in latest map atyle --- images/web/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/web/Dockerfile b/images/web/Dockerfile index 6e4f7db5..0b69e5ec 100644 --- a/images/web/Dockerfile +++ b/images/web/Dockerfile @@ -48,13 +48,13 @@ RUN npm install -g svgo # Install openstreetmap-website RUN rm -rf $workdir/html -ENV OPENHISTORICALMAP_WEBSITE_GITSHA=3f1566224aa8d6b67ee7edc10f3d69f97773b506 +ENV OPENHISTORICALMAP_WEBSITE_GITSHA=39b3d328990143aedd9859c32908c3da5fc192ac RUN git clone -b staging https://github.com/OpenHistoricalMap/ohm-website.git $workdir WORKDIR $workdir RUN git checkout $OPENHISTORICALMAP_WEBSITE_GITSHA # change the echo here with a reason for changing the commithash -RUN echo 'update map embed' +RUN echo 'update map style' RUN git fetch # Install Ruby packages