Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions images/cgimap/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export CGIMAP_MAP_AREA="0.25"
export CGIMAP_MAP_NODES="100000"
export CGIMAP_MAX_WAY_NODES="2000"
export CGIMAP_MAX_RELATION_MEMBERS="32000"
# Count created/modified/deleted nodes, ways and relations per changeset (num_*_* columns)
export CGIMAP_CHANGESET_ENHANCED_STATS="true"
# export CGIMAP_RATELIMIT_UPLOAD="true"
export CGIMAP_MODERATOR_RATELIMIT="1048576"
export CGIMAP_MODERATOR_MAXDEBT="2048"
Expand Down
4 changes: 4 additions & 0 deletions images/web/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ setup_production() {
# Tiler host. Defaults to vtiles.<server domain>; override VTILES_DOMAIN to use a
# shared tiler (e.g. a preview that has no tiler of its own).
VTILES_DOMAIN="${VTILES_DOMAIN:-vtiles.${SERVER_URL_}}"
# API host used by iD. Defaults to api.<server domain>; override API_DOMAIN when the
# API is served from the same host (e.g. a preview).
API_DOMAIN="${API_DOMAIN:-api.${SERVER_URL_}}"
find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|openhistoricalmap.github.io|${SERVER_URL}|g" {} +
find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|http://localhost:8888|https://${SERVER_URL}/map-styles|g" {} +
find /var/www/node_modules/@openhistoricalmap/map-styles/dist/ -type f -name "*.json" -exec sed -i.bak "s|www.openhistoricalmap.org|${SERVER_URL}|g" {} +
Expand All @@ -155,6 +158,7 @@ setup_production() {
-e "s|openhistoricalmap.github.io|${SERVER_URL}|g" \
-e "s|http://localhost:8888|https://${SERVER_URL}/map-styles|g" \
-e "s|www.openhistoricalmap.org|${SERVER_URL}|g" \
-e "s|\"api.openhistoricalmap.org\"|\"${API_DOMAIN}\"|g" \
-e "s|vtiles.openhistoricalmap.org|${VTILES_DOMAIN}|g" \
-e "s|vtiles.staging.openhistoricalmap.org|${VTILES_DOMAIN}|g" \
"$file"
Expand Down
2 changes: 1 addition & 1 deletion ohm/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: osm-seed
version: '0.1.0-0.dev.git.1015.h2f60149'
version: '2.0.0'
repository: https://osm-seed.github.io/osm-seed-chart/
4 changes: 3 additions & 1 deletion values.k3s.preview.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ osm-seed:
MAILER_FROM: web@noreply.openhistoricalmap.org
NOMINATIM_URL: nominatim.openhistoricalmap.org
OVERPASS_URL: overpass-api.openhistoricalmap.org
VTILES_DOMAIN: vtiles.ohmstaging.org
VTILES_DOMAIN: vtiles.openhistoricalmap.org
# preview has no api.* host; iD talks to the same host
API_DOMAIN: "{{PREVIEW_HOST}}"

# NEW_RELIC_LICENSE_KEY: "none"
# NEW_RELIC_APP_NAME: "none"
Expand Down
1 change: 1 addition & 0 deletions values.production.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ osm-seed:
NOMINATIM_URL: nominatim.openhistoricalmap.org
OVERPASS_URL: overpass-api.openhistoricalmap.org
VTILES_DOMAIN: vtiles.openhistoricalmap.org
API_DOMAIN: api.openhistoricalmap.org

NEW_RELIC_LICENSE_KEY: 'none'
NEW_RELIC_APP_NAME: 'none'
Expand Down
1 change: 1 addition & 0 deletions values.staging.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ osm-seed:
NOMINATIM_URL: nominatim.ohmstaging.org
OVERPASS_URL: overpass-api.ohmstaging.org
VTILES_DOMAIN: vtiles.ohmstaging.org
API_DOMAIN: api.ohmstaging.org

NEW_RELIC_LICENSE_KEY: "none"
NEW_RELIC_APP_NAME: "none"
Expand Down
Loading