From 12c5ef3e3e4a188a3a01adf5d3f992ceeb8701f5 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Wed, 18 Mar 2026 10:42:09 -0700 Subject: [PATCH 1/9] Addresses https://github.com/OpenHistoricalMap/issues/issues/1312 w/map-styles-0.9.13 --- images/web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/web/Dockerfile b/images/web/Dockerfile index 1d70da38..e5790bb7 100644 --- a/images/web/Dockerfile +++ b/images/web/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Download OHM Website using gitsha, faster than cloning -ENV OPENHISTORICALMAP_WEBSITE_GITSHA=a53c1384ce78e7ce3c41e410e9ec61315f0afa93 +ENV OPENHISTORICALMAP_WEBSITE_GITSHA=20dbbb00e03cae829add6ace95c0856ddb3bb923 ENV OHM_WEBSITE_URL=https://github.com/OpenHistoricalMap/ohm-website/archive/${OPENHISTORICALMAP_WEBSITE_GITSHA}.zip RUN rm -rf $workdir/* && curl -fsSL $OHM_WEBSITE_URL -o /tmp/ohm-website.zip && \ unzip /tmp/ohm-website.zip -d /tmp && \ From 891845697060d2ded13bdca156083212dde6427d Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Wed, 18 Mar 2026 11:07:34 -0700 Subject: [PATCH 2/9] Addresses https://github.com/OpenHistoricalMap/issues/issues/1312 w/updated timeslider source --- images/web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/web/Dockerfile b/images/web/Dockerfile index e5790bb7..69fff31b 100644 --- a/images/web/Dockerfile +++ b/images/web/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Download OHM Website using gitsha, faster than cloning -ENV OPENHISTORICALMAP_WEBSITE_GITSHA=20dbbb00e03cae829add6ace95c0856ddb3bb923 +ENV OPENHISTORICALMAP_WEBSITE_GITSHA=9d258f5873184e46066c3ad06272e60e1c9fff0c ENV OHM_WEBSITE_URL=https://github.com/OpenHistoricalMap/ohm-website/archive/${OPENHISTORICALMAP_WEBSITE_GITSHA}.zip RUN rm -rf $workdir/* && curl -fsSL $OHM_WEBSITE_URL -o /tmp/ohm-website.zip && \ unzip /tmp/ohm-website.zip -d /tmp && \ From e65c4a3b8210a6c2683174dab99cb8ea342382a2 Mon Sep 17 00:00:00 2001 From: "Ruben L. Mendoza" Date: Wed, 18 Mar 2026 17:07:01 -0500 Subject: [PATCH 3/9] Update Imposm template and fix network:wikidata for routes (#724) * Change role for imposm in tiler db * Include network_wikidata for new import * Update branch to build docker image * Update values to deploy in production * Fix network:wikidata for routes * Fix docker container for imposm --- .github/workflows/chartpress.yaml | 16 ++++---- hetzner/tiler/tiler.production.yml | 6 +-- .../tiler-imposm/config/imposm3.template.json | 41 +------------------ .../config/layers/route_lines.json | 5 +++ .../config/layers/route_multilines.json | 5 +++ .../ohm_mviews/routes_01_merge_by_date.sql | 8 ++-- .../tiler-imposm/scripts/setup_imposm_role.sh | 8 +--- 7 files changed, 30 insertions(+), 59 deletions(-) diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml index 328d8e0a..78d5d8d2 100644 --- a/.github/workflows/chartpress.yaml +++ b/.github/workflows/chartpress.yaml @@ -4,7 +4,7 @@ on: branches: - 'main' - 'staging' - - 'tags_imposm' + - 'pg_user' jobs: build: runs-on: ubuntu-22.04 @@ -71,7 +71,7 @@ jobs: OHM_SLACK_WEBHOOK_URL: ${{ secrets.OHM_SLACK_WEBHOOK_URL }} ################ Staging secrets ################ - name: Staging - substitute secrets - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/pg_user' uses: bluwy/substitute-string-action@v1 with: _input-file: 'values.staging.template.yaml' @@ -189,14 +189,14 @@ jobs: PRODUCTION_OPENSTREETMAP_AUTH_SECRET: ${{ secrets.PRODUCTION_OPENSTREETMAP_AUTH_SECRET }} - name: AWS Credentials - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - name: Setup Kubectl and Helm Dependencies - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' run: | sudo pip install awscli --ignore-installed six sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl @@ -210,22 +210,22 @@ jobs: helm version - name: Update kube-config staging - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/pg_user' run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging - name: Update kube-config prod if: github.ref == 'refs/heads/main' run: aws eks --region us-east-1 update-kubeconfig --name osmseed-production-v2 - name: Add Helm repository - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' run: | helm repo add osm-seed https://osm-seed.github.io/osm-seed-chart/ helm repo update - name: Install helm dependencies for - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' run: cd ohm && helm dep up # Staging - name: Staging - helm deploy - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/tags_imposm' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/pg_user' run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml # Production - name: Production - helm deploy diff --git a/hetzner/tiler/tiler.production.yml b/hetzner/tiler/tiler.production.yml index f8ef62d9..7fb106ee 100644 --- a/hetzner/tiler/tiler.production.yml +++ b/hetzner/tiler/tiler.production.yml @@ -17,7 +17,7 @@ services: tiler_imposm: container_name: tiler_imposm - image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3323.haf36ae7d + image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3323.h6950acce volumes: - tiler_imposm_data:/mnt/data env_file: @@ -137,10 +137,10 @@ services: volumes: tiler_pgdata: driver: local - name: tiler_db_16_03 + name: tiler_db_17_03 tiler_imposm_data: driver: local - name: tiler_imposm_16_03 + name: tiler_imposm_17_03 networks: ohm_network: diff --git a/images/tiler-imposm/config/imposm3.template.json b/images/tiler-imposm/config/imposm3.template.json index 3d49319a..a474db1f 100644 --- a/images/tiler-imposm/config/imposm3.template.json +++ b/images/tiler-imposm/config/imposm3.template.json @@ -89,51 +89,14 @@ "traffic_signals", "traffic_signals:*", "button_operated", - "sidewalk", "sidewalk:*", - "parking", "parking:*", "lit", "smoothness", "direction", - "ele", - - "building", - "natural", - "landuse", - "highway", - "railway", - "aeroway", - "waterway", - "barrier", - "leisure", - "historic", - "man_made", - "power", - "military", - "amenity", - "place", - "tourism", - "shop", - "craft", - "boundary", - "communication", - "route", - "start_date", - "end_date", - "name", - "oneway", - "bridge", - "access", - "service", - "ford", - "surface", - "lanes", - "maxspeed", - "admin_level", - "type" + "ele" ] }, "generalized_tables": {}, "tables": {} -} \ No newline at end of file +} diff --git a/images/tiler-imposm/config/layers/route_lines.json b/images/tiler-imposm/config/layers/route_lines.json index b98fda6d..4ca0d1fb 100644 --- a/images/tiler-imposm/config/layers/route_lines.json +++ b/images/tiler-imposm/config/layers/route_lines.json @@ -47,6 +47,11 @@ "name": "network", "type": "string" }, + { + "key": "network:wikidata", + "name": "network_wikidata", + "type": "string" + }, { "key": "direction", "name": "direction", diff --git a/images/tiler-imposm/config/layers/route_multilines.json b/images/tiler-imposm/config/layers/route_multilines.json index a178ea37..e6c862f2 100644 --- a/images/tiler-imposm/config/layers/route_multilines.json +++ b/images/tiler-imposm/config/layers/route_multilines.json @@ -47,6 +47,11 @@ "name": "network", "type": "string" }, + { + "key": "network:wikidata", + "name": "network_wikidata", + "type": "string" + }, { "key": "direction", "name": "direction", diff --git a/images/tiler-imposm/queries/ohm_mviews/routes_01_merge_by_date.sql b/images/tiler-imposm/queries/ohm_mviews/routes_01_merge_by_date.sql index 16eb61ac..9073b182 100644 --- a/images/tiler-imposm/queries/ohm_mviews/routes_01_merge_by_date.sql +++ b/images/tiler-imposm/queries/ohm_mviews/routes_01_merge_by_date.sql @@ -118,7 +118,7 @@ WITH union_sources AS ( -- 1) From multi-lines (relations with members) SELECT member::bigint AS way_id, - osm_id, name, type, route, ref, network, operator, direction, tags, geometry, + osm_id, name, type, route, ref, network, network_wikidata, operator, direction, tags, geometry, start_decdate, end_decdate, me_highway AS highway @@ -130,7 +130,7 @@ WITH union_sources AS ( -- 2) From lines (direct way-based routes) SELECT osm_id::bigint AS way_id, - osm_id, name, type, route, ref, network, operator, direction, tags, geometry, + osm_id, name, type, route, ref, network, network_wikidata, operator, direction, tags, geometry, start_decdate, end_decdate, highway @@ -160,6 +160,7 @@ data_for_null_dates AS ( 'ref', u.ref, 'route', u.route, 'network', u.network, + 'network:wikidata', u.network_wikidata, 'name', u.name, 'type', u.type, 'operator', u.operator, @@ -200,7 +201,7 @@ data_for_dated_ways AS ( -- Relate active routes to each time segment SELECT s.way_id, s.seg_start, s.seg_end, - u.osm_id, u.ref, u.route, u.network, u.name, u.type, u.operator, u.direction, u.tags, u.geometry, u.highway + u.osm_id, u.ref, u.route, u.network, u.network_wikidata, u.name, u.type, u.operator, u.direction, u.tags, u.geometry, u.highway FROM segments s JOIN union_sources u ON u.way_id = s.way_id @@ -232,6 +233,7 @@ data_for_dated_ways AS ( 'ref', ref, 'route', route, 'network', network, + 'network:wikidata', network_wikidata, 'name', name, 'type', type, 'operator', operator, diff --git a/images/tiler-imposm/scripts/setup_imposm_role.sh b/images/tiler-imposm/scripts/setup_imposm_role.sh index 61519bb3..b884b887 100755 --- a/images/tiler-imposm/scripts/setup_imposm_role.sh +++ b/images/tiler-imposm/scripts/setup_imposm_role.sh @@ -16,12 +16,8 @@ BEGIN END \$\$; --- Permissions -GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB TO imposm; -GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO imposm; -GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO imposm; -ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON TABLES TO imposm; -ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL ON SEQUENCES TO imposm; +-- Grant superuser to imposm so it has full permissions like postgres +ALTER ROLE imposm SUPERUSER; -- Session-level parameters (only apply to imposm connections, not Tegola) ALTER ROLE imposm IN DATABASE $POSTGRES_DB SET work_mem = '${IMPOSM_WORK_MEM:-1GB}'; From d2e48a34e1e6e9c967de65e8d2d69501ea9a7be1 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 19 Mar 2026 08:41:56 -0700 Subject: [PATCH 4/9] id-v2.29.6 --- images/web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/web/Dockerfile b/images/web/Dockerfile index 69fff31b..eba15c1e 100644 --- a/images/web/Dockerfile +++ b/images/web/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && \ && apt-get clean && rm -rf /var/lib/apt/lists/* # Download OHM Website using gitsha, faster than cloning -ENV OPENHISTORICALMAP_WEBSITE_GITSHA=9d258f5873184e46066c3ad06272e60e1c9fff0c +ENV OPENHISTORICALMAP_WEBSITE_GITSHA=7ad2415aef444aa98775b1a5a8e4cd5124b7b8a5 ENV OHM_WEBSITE_URL=https://github.com/OpenHistoricalMap/ohm-website/archive/${OPENHISTORICALMAP_WEBSITE_GITSHA}.zip RUN rm -rf $workdir/* && curl -fsSL $OHM_WEBSITE_URL -o /tmp/ohm-website.zip && \ unzip /tmp/ohm-website.zip -d /tmp && \ From aba1cff857cf0085f0072f3535003a023deb979a Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Thu, 19 Mar 2026 09:12:28 -0700 Subject: [PATCH 5/9] https://github.com/OpenHistoricalMap/issues/issues/1309: corrects spelling in prod template --- values.production.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values.production.template.yaml b/values.production.template.yaml index 4657e7ea..ceebb445 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -870,7 +870,7 @@ osm-seed: UPDATE_MODE: continuous OSMSEED_WEB_API_DOMAIN: www.openhistoricalmap.org IMPORT_STYLE: extratags - EXTRA_TAGS: start_date,start_date:edtf,end_date,end_date:edt + EXTRA_TAGS: start_date,start_date:edtf,end_date,end_date:edtf resources: enabled: false requests: From b19a97ab00e93fc0d47ab365050f1f59c5e6658c Mon Sep 17 00:00:00 2001 From: "Ruben L. Mendoza" Date: Thu, 19 Mar 2026 17:22:37 -0500 Subject: [PATCH 6/9] Fix extra tags for nominatim (#728) --- hetzner/nominatim/nominatim.base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hetzner/nominatim/nominatim.base.yml b/hetzner/nominatim/nominatim.base.yml index 6449ba9b..b9c6fe6f 100644 --- a/hetzner/nominatim/nominatim.base.yml +++ b/hetzner/nominatim/nominatim.base.yml @@ -20,7 +20,7 @@ services: NOMINATIM_ADDRESS_LEVEL_CONFIG_URL: https://raw.githubusercontent.com/OpenHistoricalMap/nominatim-ui/master/address-levels.json UPDATE_MODE: continuous IMPORT_STYLE: extratags - EXTRA_TAGS: "start_date,start_date:edtf,end_date,end_date:edt" + EXTRA_TAGS: "start_date,start_date:edtf,end_date,end_date:edtf" restart: always healthcheck: test: ["CMD-SHELL", "curl -f http://localhost:8080/status || exit 1"] From 9f006433e8ad9d9eaa90af5847a0d85e23ac6caf Mon Sep 17 00:00:00 2001 From: "Ruben L. Mendoza" Date: Tue, 24 Mar 2026 10:28:25 -0500 Subject: [PATCH 7/9] Update tiler server docker image (#730) --- hetzner/tiler/tiler.production.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hetzner/tiler/tiler.production.yml b/hetzner/tiler/tiler.production.yml index 7fb106ee..ec45173d 100644 --- a/hetzner/tiler/tiler.production.yml +++ b/hetzner/tiler/tiler.production.yml @@ -39,7 +39,7 @@ services: # Tiler server tiler_server: container_name: tiler_server - image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176 + image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3292.h0f5e7d60 # ports: # - "9090:9090" restart: always From 7936de653d9c9fd12d773ac47b5ea7d1bea2386f Mon Sep 17 00:00:00 2001 From: "Ruben L. Mendoza" Date: Tue, 24 Mar 2026 16:10:27 -0500 Subject: [PATCH 8/9] Update kubectl to deploy helmcharts (#732) * Update kubectl version * Add --timeout 10m to deploy helm charts --- .github/workflows/chartpress.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/chartpress.yaml b/.github/workflows/chartpress.yaml index 78d5d8d2..238bc9a9 100644 --- a/.github/workflows/chartpress.yaml +++ b/.github/workflows/chartpress.yaml @@ -4,7 +4,7 @@ on: branches: - 'main' - 'staging' - - 'pg_user' + - 'k8s_deploy' jobs: build: runs-on: ubuntu-22.04 @@ -71,7 +71,7 @@ jobs: OHM_SLACK_WEBHOOK_URL: ${{ secrets.OHM_SLACK_WEBHOOK_URL }} ################ Staging secrets ################ - name: Staging - substitute secrets - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/pg_user' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/k8s_deploy' uses: bluwy/substitute-string-action@v1 with: _input-file: 'values.staging.template.yaml' @@ -189,46 +189,46 @@ jobs: PRODUCTION_OPENSTREETMAP_AUTH_SECRET: ${{ secrets.PRODUCTION_OPENSTREETMAP_AUTH_SECRET }} - name: AWS Credentials - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/k8s_deploy' uses: aws-actions/configure-aws-credentials@v1 with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - name: Setup Kubectl and Helm Dependencies - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/k8s_deploy' run: | sudo pip install awscli --ignore-installed six - sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl + sudo curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v1.33.0/bin/linux/amd64/kubectl sudo chmod +x /usr/bin/kubectl - sudo curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/aws-iam-authenticator + sudo curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.21.2/2021-07-05/bin/linux/amd64/aws-iam-authenticator sudo chmod +x /usr/bin/aws-iam-authenticator - curl -L https://get.helm.sh/helm-v3.14.4-linux-amd64.tar.gz -o helm.tar.gz + curl -L https://get.helm.sh/helm-v3.17.3-linux-amd64.tar.gz -o helm.tar.gz tar -xvzf helm.tar.gz sudo mv linux-amd64/helm /usr/local/bin/ sudo chmod +x /usr/local/bin/helm helm version - name: Update kube-config staging - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/pg_user' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/k8s_deploy' run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging - name: Update kube-config prod if: github.ref == 'refs/heads/main' run: aws eks --region us-east-1 update-kubeconfig --name osmseed-production-v2 - name: Add Helm repository - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/k8s_deploy' run: | helm repo add osm-seed https://osm-seed.github.io/osm-seed-chart/ helm repo update - name: Install helm dependencies for - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/pg_user' + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/k8s_deploy' run: cd ohm && helm dep up # Staging - name: Staging - helm deploy - if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/pg_user' - run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml + if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/k8s_deploy' + run: helm upgrade --install staging --wait --timeout 10m ohm/ -f values.staging.yaml -f ohm/values.yaml # Production - name: Production - helm deploy if: github.ref == 'refs/heads/main' - run: helm upgrade --install production --wait ohm/ -f values.production.yaml -f ohm/values.yaml + run: helm upgrade --install production --wait --timeout 10m ohm/ -f values.production.yaml -f ohm/values.yaml \ No newline at end of file From f2354670e68ac21a170f51b2da286fd019e41f9f Mon Sep 17 00:00:00 2001 From: "Ruben L. Mendoza" Date: Tue, 24 Mar 2026 17:41:23 -0500 Subject: [PATCH 9/9] Reduce cgimap instances for container and update config for API DB (#733) --- images/cgimap/start.sh | 2 +- values.production.template.yaml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/cgimap/start.sh b/images/cgimap/start.sh index c5306aef..57066f49 100755 --- a/images/cgimap/start.sh +++ b/images/cgimap/start.sh @@ -41,7 +41,7 @@ else psql -h $POSTGRES_HOST -U $POSTGRES_USER -c "SHOW enable_mergejoin;" psql -h $POSTGRES_HOST -U $POSTGRES_USER -c "SHOW enable_hashjoin;" # Start the cgimap service - openstreetmap-cgimap --port=8000 --daemon --instances=10 + openstreetmap-cgimap --port=8000 --daemon --instances=5 # Sleep fo 3 sec for tail the logs sleep 3 # Keep container alive diff --git a/values.production.template.yaml b/values.production.template.yaml index ceebb445..4d89b6b6 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -64,13 +64,13 @@ osm-seed: max_connections = 200 shared_buffers = 4GB work_mem = 20MB - maintenance_work_mem = 512MB + maintenance_work_mem = 1GB dynamic_shared_memory_type = posix effective_io_concurrency = 200 - max_wal_size = 1GB - min_wal_size = 256MB - random_page_cost = 1.0 - effective_cache_size = 8GB + max_wal_size = 2GB + min_wal_size = 512MB + random_page_cost = 1.1 + effective_cache_size = 12GB log_min_duration_statement = 3000 log_connections = on log_disconnections = on @@ -86,9 +86,9 @@ osm-seed: lc_time = 'en_US.utf8' default_text_search_config = 'pg_catalog.english' # Parallelism settings - max_parallel_workers_per_gather = 2 - max_parallel_workers = 4 - max_worker_processes = 4 + max_parallel_workers_per_gather = 1 + max_parallel_workers = 2 + max_worker_processes = 2 parallel_tuple_cost = 0.05 parallel_setup_cost = 500 min_parallel_table_scan_size = 2MB