Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add embed_server_url #262

Merged
merged 4 commits into from
Jan 18, 2024
Merged

Add embed_server_url #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d48727
Add embed_server_url and disable taginfo - staging
Jan 11, 2024
26e7532
Disable nominatim -staging
Jan 11, 2024
50676db
pull in latest map atyle
danrademacher Jan 18, 2024
a3469cf
Merge pull request #264 from OpenHistoricalMap/map-style-update
danrademacher Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions images/web/config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
4 changes: 2 additions & 2 deletions values.staging.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -649,7 +649,7 @@ osm-seed:
# Variables for taginfo
# ====================================================================================================
taginfo:
enabled: true
enabled: false
nodeSelector:
enabled: false
label_key: nodegroup_type
Expand Down
Loading