Skip to content

Commit

Permalink
Merge pull request #262 from OpenHistoricalMap/staging
Browse files Browse the repository at this point in the history
Add embed_server_url and update map style
  • Loading branch information
danrademacher authored Jan 18, 2024
2 parents 39a00fb + a3469cf commit 2d3b77d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions images/web/Dockerfile
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
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
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

0 comments on commit 2d3b77d

Please sign in to comment.