From b7de7690a30063861948fe2dbac58deb34f96f01 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 16 Apr 2024 18:47:16 -0500 Subject: [PATCH 01/31] Update postgres version from 11 to 14 --- compose/web.yml | 20 ++++++++++---------- images/db/Dockerfile | 17 ++++++----------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/compose/web.yml b/compose/web.yml index e825d9b6..b44e5727 100644 --- a/compose/web.yml +++ b/compose/web.yml @@ -11,16 +11,16 @@ services: volumes: - ./data/db-data:/var/lib/postgresql/data env_file: - - ./.env.web - web: - image: osmseed-web:v1 - build: - context: ./../images/web - dockerfile: Dockerfile - ports: - - '80:80' - env_file: - - ./.env.web + - ./../envs/.env.web + # web: + # image: osmseed-web:v1 + # build: + # context: ./../images/web + # dockerfile: Dockerfile + # ports: + # - '80:80' + # env_file: + # - ./../envs/.env.web ####### Enable for development mode # volumes: # - ./../../ohm-website:/var/www diff --git a/images/db/Dockerfile b/images/db/Dockerfile index c17d1038..158f9b85 100644 --- a/images/db/Dockerfile +++ b/images/db/Dockerfile @@ -1,16 +1,11 @@ -FROM postgres:11 -RUN rm /etc/apt/sources.list.d/pgdg.list -RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list -RUN sed -i 's|security.debian.org|archive.debian.org|g' /etc/apt/sources.list -RUN sed -i '/stretch-updates/d' /etc/apt/sources.list -RUN apt-get update && apt-get -y install apt-transport-https -RUN echo "deb [ signed-by=/usr/local/share/keyrings/postgres.gpg.asc ] https://apt-archive.postgresql.org/pub/repos/apt/ stretch-pgdg main 11" >/etc/apt/sources.list.d/pgdg.list -RUN apt-get update && apt-get install -y \ - postgresql-server-dev-11 \ +FROM postgres:14 +RUN apt-get update \ + && apt-get install -y \ + postgresql-server-dev-14 \ make \ build-essential \ - postgresql-11-postgis-2.5 && \ - apt-get clean && rm -rf /var/lib/apt/lists/* + postgresql-14-postgis-3 \ + && apt-get clean && rm -rf /var/lib/apt/lists/* ADD functions/functions.sql /usr/local/share/osm-db-functions.sql ADD docker_postgres.sh /docker-entrypoint-initdb.d/ From 96821a7e301d56039906624f753b7c4a363aba71 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 18 Apr 2024 10:52:08 -0500 Subject: [PATCH 02/31] Update path for env vars - development --- compose/web.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/compose/web.yml b/compose/web.yml index b44e5727..e240b62a 100644 --- a/compose/web.yml +++ b/compose/web.yml @@ -12,15 +12,15 @@ services: - ./data/db-data:/var/lib/postgresql/data env_file: - ./../envs/.env.web - # web: - # image: osmseed-web:v1 - # build: - # context: ./../images/web - # dockerfile: Dockerfile - # ports: - # - '80:80' - # env_file: - # - ./../envs/.env.web - ####### Enable for development mode - # volumes: - # - ./../../ohm-website:/var/www + web: + image: osmseed-web:v1 + build: + context: ./../images/web + dockerfile: Dockerfile + ports: + - '80:80' + env_file: + - ./../envs/.env.web +####### Enable for development mode +# volumes: +# - ./../../ohm-website:/var/www From 48cede685933463c3b35e6d8ced1e561f470571f Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 18 Apr 2024 11:00:08 -0500 Subject: [PATCH 03/31] Update the EBS volume that contains the migration data --- 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 bcf29235..8998836b 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -79,7 +79,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-db # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : {{STAGING_DB_EBS}} + AWS_ElasticBlockStore_volumeID : vol-07a175d4e92732c1 AWS_ElasticBlockStore_size: 200Gi resources: enabled: false From 6410929c3edf2f81df47ea671edad53f28abf489 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 18 Apr 2024 17:46:50 -0500 Subject: [PATCH 04/31] Update ebs from migration --- 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 8998836b..7f4cc57a 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -79,7 +79,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-db # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-07a175d4e92732c1 + AWS_ElasticBlockStore_volumeID : vol-08e9a73c3c0f2855c AWS_ElasticBlockStore_size: 200Gi resources: enabled: false From 31b56d48e852a4249b90d5ca71b7e8512dfe2abb Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 19 Apr 2024 10:40:35 -0500 Subject: [PATCH 05/31] Set up settings-local.yml --- images/web/Dockerfile | 2 +- images/web/config/settings-local.yml | 28 +++++ images/web/config/settings.yml | 150 --------------------------- images/web/start.sh | 39 +++---- ohm/requirements.yaml | 2 +- values.production.template.yaml | 1 + values.staging.template.yaml | 1 + 7 files changed, 53 insertions(+), 170 deletions(-) create mode 100644 images/web/config/settings-local.yml delete mode 100644 images/web/config/settings.yml diff --git a/images/web/Dockerfile b/images/web/Dockerfile index c19740ba..b9c5eb16 100644 --- a/images/web/Dockerfile +++ b/images/web/Dockerfile @@ -107,7 +107,7 @@ RUN apache2ctl configtest RUN chown -R www-data: $workdir # Add settings -ADD config/settings.yml $workdir/config/ +ADD config/settings-local.yml $workdir/config/ COPY start.sh $workdir/ COPY liveness.sh $workdir/ diff --git a/images/web/config/settings-local.yml b/images/web/config/settings-local.yml new file mode 100644 index 00000000..550ee763 --- /dev/null +++ b/images/web/config/settings-local.yml @@ -0,0 +1,28 @@ +# The server protocol and host +server_protocol: "http" +server_url: "openhistoricalmap.example.com" +status: "online" +# OAuth application for the web site +oauth_application: "OAUTH_CLIENT_ID" +oauth_key: "OAUTH_KEY" +# OAuth consumer key for iD +id_application: "" +# List of memcache servers to use for caching +memcache_servers: [] +# URL of Nominatim instance to use for geocoding +nominatim_url: "https://nominatim.openhistoricalmap.org/" +# URL of Overpass instance to use for feature queries +overpass_url: "https://overpass-api.de/api/interpreter" +# SMTP settings for outbound mail +smtp_address: "localhost" +smtp_port: 25 +smtp_domain: "localhost" +smtp_enable_starttls_auto: true +smtp_tls_verify_mode: "none" +smtp_authentication: null +smtp_user_name: null +smtp_password: null +doorkeeper_signing_key: | + -----BEGIN PRIVATE KEY----- + PRIVATE_KEY + -----END PRIVATE KEY----- diff --git a/images/web/config/settings.yml b/images/web/config/settings.yml deleted file mode 100644 index 53e9d622..00000000 --- a/images/web/config/settings.yml +++ /dev/null @@ -1,150 +0,0 @@ -# The server protocol and host -server_protocol: "http" -server_url: "openhistoricalmap.example.com" -# Publisher -#publisher_url: "" -# The generator -generator: "OpenHistoricalMap server" -copyright_owner: "OpenHistoricalMap and contributors" -attribution_url: "http://www.openhistoricalmap.org/copyright" -license_url: "http://opendatacommons.org/licenses/odbl/1-0/" -# Support email address -support_email: "ohm-admins@googlegroups.com" -# Sender addresses for emails -email_from: "OpenHistoricalMap " -email_return_path: "ohm-admins@googlegroups.com" -# API version -api_version: "0.6" -# Application status - possible values are: -# online - online and operating normally -# api_readonly - site online but API in read-only mode -# api_offline - site online but API offline -# database_readonly - database and site in read-only mode -# database_offline - database offline with site in emergency mode -# gpx_offline - gpx storage offline -status: "online" -# The maximum area you're allowed to request, in square degrees -max_request_area: 0.25 -# Number of GPS trace/trackpoints returned per-page -tracepoints_per_page: 5000 -# Maximum number of nodes that will be returned by the api in a map request -max_number_of_nodes: 100000 -# Maximum number of nodes that can be in a way (checked on save) -max_number_of_way_nodes: 2000 -# Maximum number of members that can be in a relation (checked on save) -max_number_of_relation_members: 32000 -# The maximum area you're allowed to request notes from, in square degrees -max_note_request_area: 25 -# Zoom level to use for postcode results from the geocoder -postcode_zoom: 15 -# Timeout for API calls in seconds -api_timeout: 300 -# Timeout for web pages in seconds -web_timeout: 30 -# Periods (in hours) which are allowed for user blocks -user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660] -# Rate limit for message sending -max_messages_per_hour: 60 -# Rate limit for friending -max_friends_per_hour: 60 -# Domain for handling message replies -#messages_domain: "messages.openstreetmap.org" -# MaxMind GeoIPv2 database -#maxmind_database: "" -# Users to show as being nearby -nearby_users: 30 -# Max radius, in km, for nearby users -nearby_radius: 50 -# Spam threshold -spam_threshold: 50 -# Delay diary entries from appearing in the feed for this many hours -diary_feed_delay: 0 -# Default legale (jurisdiction location) for contributor terms -default_legale: GB -# Location of data for attachments -attachments_dir: ":rails_root/public/attachments" -# Log file to use -#log_path: "" -# Log file to use for logstash -#logstash_path: "" -# List of memcache servers to use for caching -#memcache_servers: [] -# Enable HTTP basic authentication support -basic_auth_support: true -# Enable legacy OAuth 1.0 support -oauth_10_support: true -# URL of Nominatim instance to use for geocoding -nominatim_url: "https://nominatim.openhistoricalmap.org/" -# Default editor -default_editor: "id" -# OAuth application for the web site -oauth_application: "OAUTH_CLIENT_ID" -oauth_key: "OAUTH_KEY" -# OAuth consumer key for iD -id_application: "" -# Imagery to return in capabilities as blacklisted -imagery_blacklist: - # Current Google imagery URLs have google or googleapis in the domain - - ".*\\.google(apis)?\\..*/.*" - # Blacklist VWorld - - "http://xdworld\\.vworld\\.kr:8080/.*" - # Blacklist here - - ".*\\.here\\.com[/:].*" -# URL of Overpass instance to use for feature queries -overpass_url: "https://overpass-api.de/api/interpreter" -overpass_credentials: false -# Routing endpoints -graphhopper_url: "https://graphhopper.com/api/1/route" -fossgis_osrm_url: "https://routing.openstreetmap.de/" -fossgis_valhalla_url: "https://valhalla1.openstreetmap.de/route" -# External authentication credentials -#google_auth_id: "" -#google_auth_secret: "" -#google_openid_realm: "" -#facebook_auth_id: "" -#facebook_auth_secret: "" -#windowslive_auth_id: "" -#windowslive_auth_secret: "" -#github_auth_id: "" -#github_auth_secret: "" -#wikipedia_auth_id: "" -#wikipedia_auth_secret: "" -# Thunderforest authentication details -#thunderforest_key: "" -# Key for generating TOTP tokens -#totp_key: "" -# Enforce Content-Security-Policy -csp_enforce: false -# URL for reporting Content-Security-Policy violations -#csp_report_url: "" -# Storage services to use in production mode -avatar_storage: "local" -trace_file_storage: "local" -trace_image_storage: "local" -trace_icon_storage: "local" -# Root URL for storage services -# avatar_storage_url: -# trace_image_storage_url: -# trace_icon_storage_url: -# URL for tile CDN -#tile_cdn_url: "" -# SMTP settings for outbound mail -smtp_address: "localhost" -smtp_port: 25 -smtp_domain: "localhost" -smtp_enable_starttls_auto: true -smtp_tls_verify_mode: "none" -smtp_authentication: null -smtp_user_name: null -smtp_password: null -# Rate limit for changeset comments -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/" -# Private key for signing id_tokens -doorkeeper_signing_key: | - -----BEGIN PRIVATE KEY----- - PRIVATE_KEY - -----END PRIVATE KEY----- diff --git a/images/web/start.sh b/images/web/start.sh index a17b5921..58d06a0b 100755 --- a/images/web/start.sh +++ b/images/web/start.sh @@ -14,34 +14,37 @@ production: encoding: utf8" >$workdir/config/database.yml #### SETTING UP SERVER_URL AND SERVER_PROTOCOL -sed -i -e 's/server_url: "openhistoricalmap.example.com"/server_url: "'$SERVER_URL'"/g' $workdir/config/settings.yml -sed -i -e 's/server_protocol: "http"/server_protocol: "'$SERVER_PROTOCOL'"/g' $workdir/config/settings.yml +sed -i -e 's/server_url: "openhistoricalmap.example.com"/server_url: "'$SERVER_URL'"/g' $workdir/config/settings-local.yml +sed -i -e 's/server_protocol: "http"/server_protocol: "'$SERVER_PROTOCOL'"/g' $workdir/config/settings-local.yml + +### WEBSITE STATUS +sed -i "s/online/$WEBSITE_STATUS/g" $workdir/config/settings-local.yml #### SETTING UP MAIL SENDER -sed -i -e 's/smtp_address: "localhost"/smtp_address: "'$MAILER_ADDRESS'"/g' $workdir/config/settings.yml -sed -i -e 's/smtp_domain: "localhost"/smtp_domain: "'$MAILER_DOMAIN'"/g' $workdir/config/settings.yml -sed -i -e 's/smtp_enable_starttls_auto: false/smtp_enable_starttls_auto: true/g' $workdir/config/settings.yml -sed -i -e 's/smtp_authentication: null/smtp_authentication: "login"/g' $workdir/config/settings.yml -sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workdir/config/settings.yml -sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings.yml -sed -i -e 's/openstreetmap@example.com/'$MAILER_FROM'/g' $workdir/config/settings.yml -sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings.yml +sed -i -e 's/smtp_address: "localhost"/smtp_address: "'$MAILER_ADDRESS'"/g' $workdir/config/settings-local.yml +sed -i -e 's/smtp_domain: "localhost"/smtp_domain: "'$MAILER_DOMAIN'"/g' $workdir/config/settings-local.yml +sed -i -e 's/smtp_enable_starttls_auto: false/smtp_enable_starttls_auto: true/g' $workdir/config/settings-local.yml +sed -i -e 's/smtp_authentication: null/smtp_authentication: "login"/g' $workdir/config/settings-local.yml +sed -i -e 's/smtp_user_name: null/smtp_user_name: "'$MAILER_USERNAME'"/g' $workdir/config/settings-local.yml +sed -i -e 's/smtp_password: null/smtp_password: "'$MAILER_PASSWORD'"/g' $workdir/config/settings-local.yml +sed -i -e 's/openstreetmap@example.com/'$MAILER_FROM'/g' $workdir/config/settings-local.yml +sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings-local.yml #### SET UP ID KEY -sed -i -e 's/id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.yml +sed -i -e 's/id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings-local.yml ### SET UP OAUTH ID AND KEY -sed -i -e 's/OAUTH_CLIENT_ID/'$OAUTH_CLIENT_ID'/g' $workdir/config/settings.yml -sed -i -e 's/OAUTH_KEY/'$OAUTH_KEY'/g' $workdir/config/settings.yml +sed -i -e 's/OAUTH_CLIENT_ID/'$OAUTH_CLIENT_ID'/g' $workdir/config/settings-local.yml +sed -i -e 's/OAUTH_KEY/'$OAUTH_KEY'/g' $workdir/config/settings-local.yml #### Setup env vars for memcached server -sed -i -e 's/#memcache_servers: \[\]/memcache_servers: "'$OPENSTREETMAP_memcache_servers'"/g' $workdir/config/settings.yml +sed -i -e 's/memcache_servers: \[\]/memcache_servers: "'$OPENSTREETMAP_memcache_servers'"/g' $workdir/config/settings-local.yml ## SET NOMINATIM URL -sed -i -e 's/nominatim.openhistoricalmap.org/'$NOMINATIM_URL'/g' $workdir/config/settings.yml +sed -i -e 's/nominatim.openhistoricalmap.org/'$NOMINATIM_URL'/g' $workdir/config/settings-local.yml ## SET OVERPASS URL -sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/config/settings.yml +sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/config/settings-local.yml sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/views/site/export.html.erb sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/assets/javascripts/index/export.js @@ -49,7 +52,7 @@ sed -i -e 's/overpass-api.de/'$OVERPASS_URL'/g' $workdir/app/assets/javascripts/ openssl genpkey -algorithm RSA -out private.pem chmod 400 /var/www/private.pem export DOORKEEPER_SIGNING_KEY=$(cat /var/www/private.pem | sed -e '1d;$d' | tr -d '\n') -sed -i "s#PRIVATE_KEY#${DOORKEEPER_SIGNING_KEY}#" $workdir/config/settings.yml +sed -i "s#PRIVATE_KEY#${DOORKEEPER_SIGNING_KEY}#" $workdir/config/settings-local.yml #### CHECK IF DB IS ALREADY UP AND START THE APP flag=true @@ -62,7 +65,7 @@ while "$flag" = true; do sleep 2 done & - # Enable assets:precompile, to take lates changes for assets in $workdir/config/settings.yml. + # Enable assets:precompile, to take lates changes for assets in $workdir/config/settings-local.yml. time bundle exec rake i18n:js:export assets:precompile bundle exec rails db:migrate diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 8aa5f505..6b41953c 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n807.hc1acb2f' + version: '0.1.0-n781.h5f07b5b' repository: https://devseed.com/osm-seed-chart/ diff --git a/values.production.template.yaml b/values.production.template.yaml index bb7bde6e..964ac1da 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -110,6 +110,7 @@ osm-seed: NEW_RELIC_LICENSE_KEY: {{PRODUCTION_NEW_RELIC_LICENSE_KEY}} NEW_RELIC_APP_NAME: {{PRODUCTION_NEW_RELIC_APP_NAME}} ORGANIZATION_NAME: OpenHistoricalMap + WEBSITE_STATUS: "online" resources: enabled: true requests: diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 7f4cc57a..e1744a9e 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -120,6 +120,7 @@ osm-seed: NEW_RELIC_LICENSE_KEY: {{STAGING_NEW_RELIC_LICENSE_KEY}} NEW_RELIC_APP_NAME: {{STAGING_NEW_RELIC_APP_NAME}} ORGANIZATION_NAME: OpenHistoricalMap + WEBSITE_STATUS: "online" resources: enabled: false requests: From 71e84de5a5fed11e35fa6b840a103b4f634ae3bf Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 19 Apr 2024 15:50:20 -0500 Subject: [PATCH 06/31] Update env vars for DB --- values.staging.template.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index e1744a9e..a88fbd68 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -73,6 +73,15 @@ osm-seed: POSTGRES_DB: {{STAGING_DB}} POSTGRES_USER: {{STAGING_DB_USER}} POSTGRES_PASSWORD: {{STAGING_DB_PASSWORD}} + POSTGRES_DB_MAX_CONNECTIONS: 150 + POSTGRES_DB_SHARED_BUFFERS: 2GB + POSTGRES_DB_TEMP_BUFFERS: 64MB + POSTGRES_DB_WORK_MEM: 64MB + POSTGRES_DB_MAINTENANCE_WORK_MEM: 512MB + POSTGRES_DB_EFFECTIVE_CACHE_SIZE: 6GB + POSTGRES_DB_MAX_WAL_SIZE: 1GB + POSTGRES_DB_MIN_WAL_SIZE: 512MB + POSTGRES_DB_RANDOM_PAGE_COST: 1.1 persistenceDisk: enabled: true accessMode: ReadWriteOnce From 586e825cfb8a72c5e8adc1206ca56847a7671485 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 22 Apr 2024 17:34:53 -0500 Subject: [PATCH 07/31] Add postgresql.conf to customize values in postgres --- images/db/Dockerfile | 12 +- images/db/config/postgresql.conf | 798 +++++++++++++++++++++++++++++++ 2 files changed, 809 insertions(+), 1 deletion(-) create mode 100644 images/db/config/postgresql.conf diff --git a/images/db/Dockerfile b/images/db/Dockerfile index 158f9b85..602bb010 100644 --- a/images/db/Dockerfile +++ b/images/db/Dockerfile @@ -13,7 +13,17 @@ RUN mkdir -p db RUN mkdir -p lib ADD functions/ db/functions/ ADD lib/quad_tile/ lib/quad_tile/ - RUN make -C db/functions/ RUN chown -R postgres lib/ RUN chown -R postgres db/ + +## Validate postgresql.conf file +COPY config/postgresql.conf /etc/postgresql/postgresql.conf +RUN mkdir /var/lib/postgresql/test_data +RUN chown postgres:postgres /var/lib/postgresql/test_data +USER postgres +RUN initdb -D /var/lib/postgresql/test_data +USER root + +# Set the default command to run PostgreSQL +CMD ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"] \ No newline at end of file diff --git a/images/db/config/postgresql.conf b/images/db/config/postgresql.conf new file mode 100644 index 00000000..db70091d --- /dev/null +++ b/images/db/config/postgresql.conf @@ -0,0 +1,798 @@ +# ----------------------------- +# PostgreSQL configuration file +# ----------------------------- +# +# This file consists of lines of the form: +# +# name = value +# +# (The "=" is optional.) Whitespace may be used. Comments are introduced with +# "#" anywhere on a line. The complete list of parameter names and allowed +# values can be found in the PostgreSQL documentation. +# +# The commented-out settings shown in this file represent the default values. +# Re-commenting a setting is NOT sufficient to revert it to the default value; +# you need to reload the server. +# +# This file is read on server startup and when the server receives a SIGHUP +# signal. If you edit the file on a running system, you have to SIGHUP the +# server for the changes to take effect, run "pg_ctl reload", or execute +# "SELECT pg_reload_conf()". Some parameters, which are marked below, +# require a server shutdown and restart to take effect. +# +# Any parameter can also be given as a command-line option to the server, e.g., +# "postgres -c log_connections=on". Some parameters can be changed at run time +# with the "SET" SQL command. +# +# Memory units: B = bytes Time units: us = microseconds +# kB = kilobytes ms = milliseconds +# MB = megabytes s = seconds +# GB = gigabytes min = minutes +# TB = terabytes h = hours +# d = days + + +#------------------------------------------------------------------------------ +# FILE LOCATIONS +#------------------------------------------------------------------------------ + +# The default values of these variables are driven from the -D command-line +# option or PGDATA environment variable, represented here as ConfigDir. + +#data_directory = 'ConfigDir' # use data in another directory + # (change requires restart) +#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file + # (change requires restart) +#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file + # (change requires restart) + +# If external_pid_file is not explicitly set, no extra PID file is written. +#external_pid_file = '' # write an extra PID file + # (change requires restart) + + +#------------------------------------------------------------------------------ +# CONNECTIONS AND AUTHENTICATION +#------------------------------------------------------------------------------ + +# - Connection Settings - + +listen_addresses = '*' + # comma-separated list of addresses; + # defaults to 'localhost'; use '*' for all + # (change requires restart) +#port = 5432 # (change requires restart) +max_connections = 150 # (change requires restart) +#superuser_reserved_connections = 3 # (change requires restart) +#unix_socket_directories = '/var/run/postgresql' # comma-separated list of directories + # (change requires restart) +#unix_socket_group = '' # (change requires restart) +#unix_socket_permissions = 0777 # begin with 0 to use octal notation + # (change requires restart) +#bonjour = off # advertise server via Bonjour + # (change requires restart) +#bonjour_name = '' # defaults to the computer name + # (change requires restart) + +# - TCP settings - +# see "man tcp" for details + +#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; + # 0 selects the system default +#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; + # 0 selects the system default +#tcp_keepalives_count = 0 # TCP_KEEPCNT; + # 0 selects the system default +#tcp_user_timeout = 0 # TCP_USER_TIMEOUT, in milliseconds; + # 0 selects the system default + +#client_connection_check_interval = 0 # time between checks for client + # disconnection while running queries; + # 0 for never + +# - Authentication - + +#authentication_timeout = 1min # 1s-600s +#password_encryption = scram-sha-256 # scram-sha-256 or md5 +#db_user_namespace = off + +# GSSAPI using Kerberos +#krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab' +#krb_caseins_users = off + +# - SSL - + +#ssl = off +#ssl_ca_file = '' +#ssl_cert_file = 'server.crt' +#ssl_crl_file = '' +#ssl_crl_dir = '' +#ssl_key_file = 'server.key' +#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers +#ssl_prefer_server_ciphers = on +#ssl_ecdh_curve = 'prime256v1' +#ssl_min_protocol_version = 'TLSv1.2' +#ssl_max_protocol_version = '' +#ssl_dh_params_file = '' +#ssl_passphrase_command = '' +#ssl_passphrase_command_supports_reload = off + + +#------------------------------------------------------------------------------ +# RESOURCE USAGE (except WAL) +#------------------------------------------------------------------------------ + +# - Memory - + +shared_buffers = 128MB # min 128kB + # (change requires restart) +#huge_pages = try # on, off, or try + # (change requires restart) +#huge_page_size = 0 # zero for system default + # (change requires restart) +#temp_buffers = 8MB # min 800kB +#max_prepared_transactions = 0 # zero disables the feature + # (change requires restart) +# Caution: it is not advisable to set max_prepared_transactions nonzero unless +# you actively intend to use prepared transactions. +#work_mem = 4MB # min 64kB +#hash_mem_multiplier = 1.0 # 1-1000.0 multiplier on hash table work_mem +#maintenance_work_mem = 64MB # min 1MB +#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem +#logical_decoding_work_mem = 64MB # min 64kB +#max_stack_depth = 2MB # min 100kB +#shared_memory_type = mmap # the default is the first option + # supported by the operating system: + # mmap + # sysv + # windows + # (change requires restart) +dynamic_shared_memory_type = posix # the default is the first option + # supported by the operating system: + # posix + # sysv + # windows + # mmap + # (change requires restart) +#min_dynamic_shared_memory = 0MB # (change requires restart) + +# - Disk - + +#temp_file_limit = -1 # limits per-process temp file space + # in kilobytes, or -1 for no limit + +# - Kernel Resources - + +#max_files_per_process = 1000 # min 64 + # (change requires restart) + +# - Cost-Based Vacuum Delay - + +#vacuum_cost_delay = 0 # 0-100 milliseconds (0 disables) +#vacuum_cost_page_hit = 1 # 0-10000 credits +#vacuum_cost_page_miss = 2 # 0-10000 credits +#vacuum_cost_page_dirty = 20 # 0-10000 credits +#vacuum_cost_limit = 200 # 1-10000 credits + +# - Background Writer - + +#bgwriter_delay = 200ms # 10-10000ms between rounds +#bgwriter_lru_maxpages = 100 # max buffers written/round, 0 disables +#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round +#bgwriter_flush_after = 512kB # measured in pages, 0 disables + +# - Asynchronous Behavior - + +#backend_flush_after = 0 # measured in pages, 0 disables +#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching +#maintenance_io_concurrency = 10 # 1-1000; 0 disables prefetching +#max_worker_processes = 8 # (change requires restart) +#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers +#max_parallel_maintenance_workers = 2 # taken from max_parallel_workers +#max_parallel_workers = 8 # maximum number of max_worker_processes that + # can be used in parallel operations +#parallel_leader_participation = on +#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate + # (change requires restart) + + +#------------------------------------------------------------------------------ +# WRITE-AHEAD LOG +#------------------------------------------------------------------------------ + +# - Settings - + +#wal_level = replica # minimal, replica, or logical + # (change requires restart) +#fsync = on # flush data to disk for crash safety + # (turning this off can cause + # unrecoverable data corruption) +#synchronous_commit = on # synchronization level; + # off, local, remote_write, remote_apply, or on +#wal_sync_method = fsync # the default is the first option + # supported by the operating system: + # open_datasync + # fdatasync (default on Linux and FreeBSD) + # fsync + # fsync_writethrough + # open_sync +#full_page_writes = on # recover from partial page writes +#wal_log_hints = off # also do full page writes of non-critical updates + # (change requires restart) +#wal_compression = off # enable compression of full-page writes +#wal_init_zero = on # zero-fill new WAL files +#wal_recycle = on # recycle WAL files +#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers + # (change requires restart) +#wal_writer_delay = 200ms # 1-10000 milliseconds +#wal_writer_flush_after = 1MB # measured in pages, 0 disables +#wal_skip_threshold = 2MB + +#commit_delay = 0 # range 0-100000, in microseconds +#commit_siblings = 5 # range 1-1000 + +# - Checkpoints - + +#checkpoint_timeout = 5min # range 30s-1d +#checkpoint_completion_target = 0.9 # checkpoint target duration, 0.0 - 1.0 +#checkpoint_flush_after = 256kB # measured in pages, 0 disables +#checkpoint_warning = 30s # 0 disables +max_wal_size = 1GB +min_wal_size = 80MB + +# - Archiving - + +#archive_mode = off # enables archiving; off, on, or always + # (change requires restart) +#archive_command = '' # command to use to archive a logfile segment + # placeholders: %p = path of file to archive + # %f = file name only + # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' +#archive_timeout = 0 # force a logfile segment switch after this + # number of seconds; 0 disables + +# - Archive Recovery - + +# These are only used in recovery mode. + +#restore_command = '' # command to use to restore an archived logfile segment + # placeholders: %p = path of file to restore + # %f = file name only + # e.g. 'cp /mnt/server/archivedir/%f %p' +#archive_cleanup_command = '' # command to execute at every restartpoint +#recovery_end_command = '' # command to execute at completion of recovery + +# - Recovery Target - + +# Set these only when performing a targeted recovery. + +#recovery_target = '' # 'immediate' to end recovery as soon as a + # consistent state is reached + # (change requires restart) +#recovery_target_name = '' # the named restore point to which recovery will proceed + # (change requires restart) +#recovery_target_time = '' # the time stamp up to which recovery will proceed + # (change requires restart) +#recovery_target_xid = '' # the transaction ID up to which recovery will proceed + # (change requires restart) +#recovery_target_lsn = '' # the WAL LSN up to which recovery will proceed + # (change requires restart) +#recovery_target_inclusive = on # Specifies whether to stop: + # just after the specified recovery target (on) + # just before the recovery target (off) + # (change requires restart) +#recovery_target_timeline = 'latest' # 'current', 'latest', or timeline ID + # (change requires restart) +#recovery_target_action = 'pause' # 'pause', 'promote', 'shutdown' + # (change requires restart) + + +#------------------------------------------------------------------------------ +# REPLICATION +#------------------------------------------------------------------------------ + +# - Sending Servers - + +# Set these on the primary and on any standby that will send replication data. + +#max_wal_senders = 10 # max number of walsender processes + # (change requires restart) +#max_replication_slots = 10 # max number of replication slots + # (change requires restart) +#wal_keep_size = 0 # in megabytes; 0 disables +#max_slot_wal_keep_size = -1 # in megabytes; -1 disables +#wal_sender_timeout = 60s # in milliseconds; 0 disables +#track_commit_timestamp = off # collect timestamp of transaction commit + # (change requires restart) + +# - Primary Server - + +# These settings are ignored on a standby server. + +#synchronous_standby_names = '' # standby servers that provide sync rep + # method to choose sync standbys, number of sync standbys, + # and comma-separated list of application_name + # from standby(s); '*' = all +#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed + +# - Standby Servers - + +# These settings are ignored on a primary server. + +#primary_conninfo = '' # connection string to sending server +#primary_slot_name = '' # replication slot on sending server +#promote_trigger_file = '' # file name whose presence ends recovery +#hot_standby = on # "off" disallows queries during recovery + # (change requires restart) +#max_standby_archive_delay = 30s # max delay before canceling queries + # when reading WAL from archive; + # -1 allows indefinite delay +#max_standby_streaming_delay = 30s # max delay before canceling queries + # when reading streaming WAL; + # -1 allows indefinite delay +#wal_receiver_create_temp_slot = off # create temp slot if primary_slot_name + # is not set +#wal_receiver_status_interval = 10s # send replies at least this often + # 0 disables +#hot_standby_feedback = off # send info from standby to prevent + # query conflicts +#wal_receiver_timeout = 60s # time that receiver waits for + # communication from primary + # in milliseconds; 0 disables +#wal_retrieve_retry_interval = 5s # time to wait before retrying to + # retrieve WAL after a failed attempt +#recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery + +# - Subscribers - + +# These settings are ignored on a publisher. + +#max_logical_replication_workers = 4 # taken from max_worker_processes + # (change requires restart) +#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers + + +#------------------------------------------------------------------------------ +# QUERY TUNING +#------------------------------------------------------------------------------ + +# - Planner Method Configuration - + +#enable_async_append = on +#enable_bitmapscan = on +#enable_gathermerge = on +#enable_hashagg = on +#enable_hashjoin = on +#enable_incremental_sort = on +#enable_indexscan = on +#enable_indexonlyscan = on +#enable_material = on +#enable_memoize = on +#enable_mergejoin = on +#enable_nestloop = on +#enable_parallel_append = on +#enable_parallel_hash = on +#enable_partition_pruning = on +#enable_partitionwise_join = off +#enable_partitionwise_aggregate = off +#enable_seqscan = on +#enable_sort = on +#enable_tidscan = on + +# - Planner Cost Constants - + +#seq_page_cost = 1.0 # measured on an arbitrary scale +#random_page_cost = 4.0 # same scale as above +#cpu_tuple_cost = 0.01 # same scale as above +#cpu_index_tuple_cost = 0.005 # same scale as above +#cpu_operator_cost = 0.0025 # same scale as above +#parallel_setup_cost = 1000.0 # same scale as above +#parallel_tuple_cost = 0.1 # same scale as above +#min_parallel_table_scan_size = 8MB +#min_parallel_index_scan_size = 512kB +#effective_cache_size = 4GB + +#jit_above_cost = 100000 # perform JIT compilation if available + # and query more expensive than this; + # -1 disables +#jit_inline_above_cost = 500000 # inline small functions if query is + # more expensive than this; -1 disables +#jit_optimize_above_cost = 500000 # use expensive JIT optimizations if + # query is more expensive than this; + # -1 disables + +# - Genetic Query Optimizer - + +#geqo = on +#geqo_threshold = 12 +#geqo_effort = 5 # range 1-10 +#geqo_pool_size = 0 # selects default based on effort +#geqo_generations = 0 # selects default based on effort +#geqo_selection_bias = 2.0 # range 1.5-2.0 +#geqo_seed = 0.0 # range 0.0-1.0 + +# - Other Planner Options - + +#default_statistics_target = 100 # range 1-10000 +#constraint_exclusion = partition # on, off, or partition +#cursor_tuple_fraction = 0.1 # range 0.0-1.0 +#from_collapse_limit = 8 +#jit = on # allow JIT compilation +#join_collapse_limit = 8 # 1 disables collapsing of explicit + # JOIN clauses +#plan_cache_mode = auto # auto, force_generic_plan or + # force_custom_plan + + +#------------------------------------------------------------------------------ +# REPORTING AND LOGGING +#------------------------------------------------------------------------------ + +# - Where to Log - + +#log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog, and eventlog, + # depending on platform. csvlog + # requires logging_collector to be on. + +# This is used when logging to stderr: +#logging_collector = off # Enable capturing of stderr and csvlog + # into log files. Required to be on for + # csvlogs. + # (change requires restart) + +# These are only used if logging_collector is on: +#log_directory = 'log' # directory where log files are written, + # can be absolute or relative to PGDATA +#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, + # can include strftime() escapes +#log_file_mode = 0600 # creation mode for log files, + # begin with 0 to use octal notation +#log_rotation_age = 1d # Automatic rotation of logfiles will + # happen after that time. 0 disables. +#log_rotation_size = 10MB # Automatic rotation of logfiles will + # happen after that much log output. + # 0 disables. +#log_truncate_on_rotation = off # If on, an existing log file with the + # same name as the new log file will be + # truncated rather than appended to. + # But such truncation only occurs on + # time-driven rotation, not on restarts + # or size-driven rotation. Default is + # off, meaning append to existing files + # in all cases. + +# These are relevant when logging to syslog: +#syslog_facility = 'LOCAL0' +#syslog_ident = 'postgres' +#syslog_sequence_numbers = on +#syslog_split_messages = on + +# This is only relevant when logging to eventlog (Windows): +# (change requires restart) +#event_source = 'PostgreSQL' + +# - When to Log - + +#log_min_messages = warning # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic + +#log_min_error_statement = error # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic (effectively off) + +#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements + # and their durations, > 0 logs only + # statements running at least this number + # of milliseconds + +#log_min_duration_sample = -1 # -1 is disabled, 0 logs a sample of statements + # and their durations, > 0 logs only a sample of + # statements running at least this number + # of milliseconds; + # sample fraction is determined by log_statement_sample_rate + +#log_statement_sample_rate = 1.0 # fraction of logged statements exceeding + # log_min_duration_sample to be logged; + # 1.0 logs all such statements, 0.0 never logs + + +#log_transaction_sample_rate = 0.0 # fraction of transactions whose statements + # are logged regardless of their duration; 1.0 logs all + # statements from all transactions, 0.0 never logs + +# - What to Log - + +#debug_print_parse = off +#debug_print_rewritten = off +#debug_print_plan = off +#debug_pretty_print = on +#log_autovacuum_min_duration = -1 # log autovacuum activity; + # -1 disables, 0 logs all actions and + # their durations, > 0 logs only + # actions running at least this number + # of milliseconds. +#log_checkpoints = off +#log_connections = off +#log_disconnections = off +#log_duration = off +#log_error_verbosity = default # terse, default, or verbose messages +#log_hostname = off +#log_line_prefix = '%m [%p] ' # special values: + # %a = application name + # %u = user name + # %d = database name + # %r = remote host and port + # %h = remote host + # %b = backend type + # %p = process ID + # %P = process ID of parallel group leader + # %t = timestamp without milliseconds + # %m = timestamp with milliseconds + # %n = timestamp with milliseconds (as a Unix epoch) + # %Q = query ID (0 if none or not computed) + # %i = command tag + # %e = SQL state + # %c = session ID + # %l = session line number + # %s = session start timestamp + # %v = virtual transaction ID + # %x = transaction ID (0 if none) + # %q = stop here in non-session + # processes + # %% = '%' + # e.g. '<%u%%%d> ' +#log_lock_waits = off # log lock waits >= deadlock_timeout +#log_recovery_conflict_waits = off # log standby recovery conflict waits + # >= deadlock_timeout +#log_parameter_max_length = -1 # when logging statements, limit logged + # bind-parameter values to N bytes; + # -1 means print in full, 0 disables +#log_parameter_max_length_on_error = 0 # when logging an error, limit logged + # bind-parameter values to N bytes; + # -1 means print in full, 0 disables +#log_statement = 'none' # none, ddl, mod, all +#log_replication_commands = off +#log_temp_files = -1 # log temporary files equal or larger + # than the specified size in kilobytes; + # -1 disables, 0 logs all temp files +log_timezone = 'Etc/UTC' + + +#------------------------------------------------------------------------------ +# PROCESS TITLE +#------------------------------------------------------------------------------ + +#cluster_name = '' # added to process titles if nonempty + # (change requires restart) +#update_process_title = on + + +#------------------------------------------------------------------------------ +# STATISTICS +#------------------------------------------------------------------------------ + +# - Query and Index Statistics Collector - + +#track_activities = on +#track_activity_query_size = 1024 # (change requires restart) +#track_counts = on +#track_io_timing = off +#track_wal_io_timing = off +#track_functions = none # none, pl, all +#stats_temp_directory = 'pg_stat_tmp' + + +# - Monitoring - + +#compute_query_id = auto +#log_statement_stats = off +#log_parser_stats = off +#log_planner_stats = off +#log_executor_stats = off + + +#------------------------------------------------------------------------------ +# AUTOVACUUM +#------------------------------------------------------------------------------ + +#autovacuum = on # Enable autovacuum subprocess? 'on' + # requires track_counts to also be on. +#autovacuum_max_workers = 3 # max number of autovacuum subprocesses + # (change requires restart) +#autovacuum_naptime = 1min # time between autovacuum runs +#autovacuum_vacuum_threshold = 50 # min number of row updates before + # vacuum +#autovacuum_vacuum_insert_threshold = 1000 # min number of row inserts + # before vacuum; -1 disables insert + # vacuums +#autovacuum_analyze_threshold = 50 # min number of row updates before + # analyze +#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum +#autovacuum_vacuum_insert_scale_factor = 0.2 # fraction of inserts over table + # size before insert vacuum +#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze +#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum + # (change requires restart) +#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age + # before forced vacuum + # (change requires restart) +#autovacuum_vacuum_cost_delay = 2ms # default vacuum cost delay for + # autovacuum, in milliseconds; + # -1 means use vacuum_cost_delay +#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for + # autovacuum, -1 means use + # vacuum_cost_limit + + +#------------------------------------------------------------------------------ +# CLIENT CONNECTION DEFAULTS +#------------------------------------------------------------------------------ + +# - Statement Behavior - + +#client_min_messages = notice # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # log + # notice + # warning + # error +#search_path = '"$user", public' # schema names +#row_security = on +#default_table_access_method = 'heap' +#default_tablespace = '' # a tablespace name, '' uses the default +#default_toast_compression = 'pglz' # 'pglz' or 'lz4' +#temp_tablespaces = '' # a list of tablespace names, '' uses + # only default tablespace +#check_function_bodies = on +#default_transaction_isolation = 'read committed' +#default_transaction_read_only = off +#default_transaction_deferrable = off +#session_replication_role = 'origin' +#statement_timeout = 0 # in milliseconds, 0 is disabled +#lock_timeout = 0 # in milliseconds, 0 is disabled +#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled +#idle_session_timeout = 0 # in milliseconds, 0 is disabled +#vacuum_freeze_table_age = 150000000 +#vacuum_freeze_min_age = 50000000 +#vacuum_failsafe_age = 1600000000 +#vacuum_multixact_freeze_table_age = 150000000 +#vacuum_multixact_freeze_min_age = 5000000 +#vacuum_multixact_failsafe_age = 1600000000 +#bytea_output = 'hex' # hex, escape +#xmlbinary = 'base64' +#xmloption = 'content' +#gin_pending_list_limit = 4MB + +# - Locale and Formatting - + +datestyle = 'iso, mdy' +#intervalstyle = 'postgres' +timezone = 'Etc/UTC' +#timezone_abbreviations = 'Default' # Select the set of available time zone + # abbreviations. Currently, there are + # Default + # Australia (historical usage) + # India + # You can create your own file in + # share/timezonesets/. +#extra_float_digits = 1 # min -15, max 3; any value >0 actually + # selects precise output mode +#client_encoding = sql_ascii # actually, defaults to database + # encoding + +# These settings are initialized by initdb, but they can be changed. +lc_messages = 'en_US.utf8' # locale for system error message + # strings +lc_monetary = 'en_US.utf8' # locale for monetary formatting +lc_numeric = 'en_US.utf8' # locale for number formatting +lc_time = 'en_US.utf8' # locale for time formatting + +# default configuration for text search +default_text_search_config = 'pg_catalog.english' + +# - Shared Library Preloading - + +#local_preload_libraries = '' +#session_preload_libraries = '' +#shared_preload_libraries = '' # (change requires restart) +#jit_provider = 'llvmjit' # JIT library to use + +# - Other Defaults - + +#dynamic_library_path = '$libdir' +#extension_destdir = '' # prepend path when loading extensions + # and shared objects (added by Debian) +#gin_fuzzy_search_limit = 0 + + +#------------------------------------------------------------------------------ +# LOCK MANAGEMENT +#------------------------------------------------------------------------------ + +#deadlock_timeout = 1s +#max_locks_per_transaction = 64 # min 10 + # (change requires restart) +#max_pred_locks_per_transaction = 64 # min 10 + # (change requires restart) +#max_pred_locks_per_relation = -2 # negative values mean + # (max_pred_locks_per_transaction + # / -max_pred_locks_per_relation) - 1 +#max_pred_locks_per_page = 2 # min 0 + + +#------------------------------------------------------------------------------ +# VERSION AND PLATFORM COMPATIBILITY +#------------------------------------------------------------------------------ + +# - Previous PostgreSQL Versions - + +#array_nulls = on +#backslash_quote = safe_encoding # on, off, or safe_encoding +#escape_string_warning = on +#lo_compat_privileges = off +#quote_all_identifiers = off +#standard_conforming_strings = on +#synchronize_seqscans = on + +# - Other Platforms and Clients - + +#transform_null_equals = off + + +#------------------------------------------------------------------------------ +# ERROR HANDLING +#------------------------------------------------------------------------------ + +#exit_on_error = off # terminate session on any error? +#restart_after_crash = on # reinitialize after backend crash? +#data_sync_retry = off # retry or panic on failure to fsync + # data? + # (change requires restart) +#recovery_init_sync_method = fsync # fsync, syncfs (Linux 5.8+) + + +#------------------------------------------------------------------------------ +# CONFIG FILE INCLUDES +#------------------------------------------------------------------------------ + +# These options allow settings to be loaded from files other than the +# default postgresql.conf. Note that these are directives, not variable +# assignments, so they can usefully be given more than once. + +#include_dir = '...' # include files ending in '.conf' from + # a directory, e.g., 'conf.d' +#include_if_exists = '...' # include file only if it exists +#include = '...' # include file + + +#------------------------------------------------------------------------------ +# CUSTOMIZED OPTIONS +#------------------------------------------------------------------------------ + +# Add settings for extensions here \ No newline at end of file From 41190928d3a0ccfa919f33975cf6186a22f8699e Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 22 Apr 2024 17:51:45 -0500 Subject: [PATCH 08/31] Update osm-seed version --- ohm/requirements.yaml | 2 +- values.staging.template.yaml | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 6b41953c..02fa9f8d 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n781.h5f07b5b' + version: '0.1.0-n782.hb589921' repository: https://devseed.com/osm-seed-chart/ diff --git a/values.staging.template.yaml b/values.staging.template.yaml index a88fbd68..e1744a9e 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -73,15 +73,6 @@ osm-seed: POSTGRES_DB: {{STAGING_DB}} POSTGRES_USER: {{STAGING_DB_USER}} POSTGRES_PASSWORD: {{STAGING_DB_PASSWORD}} - POSTGRES_DB_MAX_CONNECTIONS: 150 - POSTGRES_DB_SHARED_BUFFERS: 2GB - POSTGRES_DB_TEMP_BUFFERS: 64MB - POSTGRES_DB_WORK_MEM: 64MB - POSTGRES_DB_MAINTENANCE_WORK_MEM: 512MB - POSTGRES_DB_EFFECTIVE_CACHE_SIZE: 6GB - POSTGRES_DB_MAX_WAL_SIZE: 1GB - POSTGRES_DB_MIN_WAL_SIZE: 512MB - POSTGRES_DB_RANDOM_PAGE_COST: 1.1 persistenceDisk: enabled: true accessMode: ReadWriteOnce From fd3cb843fe67413b21dbbeeaecf66698be8af9ed Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 22 Apr 2024 20:14:56 -0500 Subject: [PATCH 09/31] Update ebs staging disk --- compose/web.yml | 4 ++-- images/db/config/postgresql.conf | 10 +++++----- values.staging.template.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compose/web.yml b/compose/web.yml index e240b62a..d7f6f9ee 100644 --- a/compose/web.yml +++ b/compose/web.yml @@ -2,7 +2,7 @@ version: '3.8' services: db: platform: linux/amd64 - image: osmseed-db:v1 + image: ohm-db:v2 build: context: ./../images/db dockerfile: Dockerfile @@ -13,7 +13,7 @@ services: env_file: - ./../envs/.env.web web: - image: osmseed-web:v1 + image: ohm-web:v1 build: context: ./../images/web dockerfile: Dockerfile diff --git a/images/db/config/postgresql.conf b/images/db/config/postgresql.conf index db70091d..944ff2f0 100644 --- a/images/db/config/postgresql.conf +++ b/images/db/config/postgresql.conf @@ -62,7 +62,7 @@ listen_addresses = '*' # defaults to 'localhost'; use '*' for all # (change requires restart) #port = 5432 # (change requires restart) -max_connections = 150 # (change requires restart) +max_connections = 200 # (change requires restart) #superuser_reserved_connections = 3 # (change requires restart) #unix_socket_directories = '/var/run/postgresql' # comma-separated list of directories # (change requires restart) @@ -130,12 +130,12 @@ shared_buffers = 128MB # min 128kB # (change requires restart) #huge_page_size = 0 # zero for system default # (change requires restart) -#temp_buffers = 8MB # min 800kB +temp_buffers = 512MB # min 800kB #max_prepared_transactions = 0 # zero disables the feature # (change requires restart) # Caution: it is not advisable to set max_prepared_transactions nonzero unless # you actively intend to use prepared transactions. -#work_mem = 4MB # min 64kB +work_mem = 32MB # min 64kB #hash_mem_multiplier = 1.0 # 1-1000.0 multiplier on hash table work_mem #maintenance_work_mem = 64MB # min 1MB #autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem @@ -382,7 +382,7 @@ min_wal_size = 80MB # - Planner Cost Constants - #seq_page_cost = 1.0 # measured on an arbitrary scale -#random_page_cost = 4.0 # same scale as above +random_page_cost = 1.1 # same scale as above #cpu_tuple_cost = 0.01 # same scale as above #cpu_index_tuple_cost = 0.005 # same scale as above #cpu_operator_cost = 0.0025 # same scale as above @@ -390,7 +390,7 @@ min_wal_size = 80MB #parallel_tuple_cost = 0.1 # same scale as above #min_parallel_table_scan_size = 8MB #min_parallel_index_scan_size = 512kB -#effective_cache_size = 4GB +effective_cache_size = 16GB #jit_above_cost = 100000 # perform JIT compilation if available # and query more expensive than this; diff --git a/values.staging.template.yaml b/values.staging.template.yaml index e1744a9e..86f8a2be 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -79,7 +79,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-db # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-08e9a73c3c0f2855c + AWS_ElasticBlockStore_volumeID : vol-09964172ef71bc8e8 AWS_ElasticBlockStore_size: 200Gi resources: enabled: false From 286e95c979d6795bd687831b3b0bbf8f74c48999 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 22 Apr 2024 22:29:42 -0500 Subject: [PATCH 10/31] Update cronjob for taginfo --- values.production.template.yaml | 2 +- values.staging.template.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values.production.template.yaml b/values.production.template.yaml index 964ac1da..dc6fdaab 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -638,7 +638,7 @@ osm-seed: CREATE_DB: 'db projects chronology' ENVIRONMENT: staging AWS_S3_BUCKET: taginfo - INTERVAL_DOWNLOAD_DATA: 86400 + INTERVAL_DOWNLOAD_DATA: 7d resources: enabled: false requests: diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 86f8a2be..1d54fc7e 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -673,7 +673,7 @@ osm-seed: CREATE_DB: 'db projects chronology' ENVIRONMENT: staging AWS_S3_BUCKET: taginfo - INTERVAL_DOWNLOAD_DATA: 86400 + INTERVAL_DOWNLOAD_DATA: 7d resources: enabled: false requests: @@ -688,7 +688,7 @@ osm-seed: label_value: web cronjob: enabled: true - schedule: "0 0 * * *" # every 1 days - testing + schedule: "0 0 * * 0" # every 7 days nodeSelector: enabled: true label_key: nodegroup_type From 900cb82f3f2cbb2a11cd95a835da94e63ffde47e Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 25 Apr 2024 10:18:31 -0500 Subject: [PATCH 11/31] Test replication files from new API DB --- values.staging.template.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 1d54fc7e..92e650e8 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -369,8 +369,8 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-d # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-0de0a9672fa9fa7e4 - AWS_ElasticBlockStore_size: 40Gi + AWS_ElasticBlockStore_volumeID : vol-0d2e86b6b7c8f530e + AWS_ElasticBlockStore_size: 100Gi resources: enabled: false requests: @@ -395,9 +395,9 @@ osm-seed: label_value: web env: TILER_IMPORT_FROM: osm - TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-240404_0003.osm.pbf + TILER_IMPORT_PBF_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/planet/planet-latest.osm.pbf REPLICATION_URL: http://s3.amazonaws.com/planet.openhistoricalmap.org/replication/minute/ - SEQUENCE_NUMBER: "1351000" + SEQUENCE_NUMBER: "675000" OVERWRITE_STATE: false UPLOAD_EXPIRED_FILES: true persistenceDisk: @@ -405,8 +405,8 @@ osm-seed: accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-0af76080fb2dfc3c0 - AWS_ElasticBlockStore_size: 40Gi + AWS_ElasticBlockStore_volumeID: vol-07750985d43369b63 + AWS_ElasticBlockStore_size: 100Gi resources: enabled: false requests: From 642ea2e6515a30e56f5d606fe9e9d55cae9f3ecc Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 25 Apr 2024 18:18:42 -0500 Subject: [PATCH 12/31] Update tiler EBS - staging, to test new API DB --- values.staging.template.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 92e650e8..f580484b 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -369,8 +369,8 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-d # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-0d2e86b6b7c8f530e - AWS_ElasticBlockStore_size: 100Gi + AWS_ElasticBlockStore_volumeID : vol-0040b8dd143c850ba + AWS_ElasticBlockStore_size: 200Gi resources: enabled: false requests: @@ -396,7 +396,7 @@ osm-seed: env: TILER_IMPORT_FROM: osm TILER_IMPORT_PBF_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/planet/planet-latest.osm.pbf - REPLICATION_URL: http://s3.amazonaws.com/planet.openhistoricalmap.org/replication/minute/ + REPLICATION_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/replication/minute/ SEQUENCE_NUMBER: "675000" OVERWRITE_STATE: false UPLOAD_EXPIRED_FILES: true @@ -405,7 +405,7 @@ osm-seed: accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-07750985d43369b63 + AWS_ElasticBlockStore_volumeID: vol-00b9ffae1cef059bd AWS_ElasticBlockStore_size: 100Gi resources: enabled: false From 039c4d7819c5e3c695b3ac35d808fd0c34b3689f Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 25 Apr 2024 19:58:27 -0500 Subject: [PATCH 13/31] Update postgres config for staging and production --- images/db/Dockerfile | 13 +- ...gresql.conf => postgresql.production.conf} | 0 images/db/config/postgresql.staging.conf | 798 ++++++++++++++++++ images/db/start.sh | 5 + ohm/requirements.yaml | 2 +- values.production.template.yaml | 1 + values.staging.template.yaml | 5 +- 7 files changed, 811 insertions(+), 13 deletions(-) rename images/db/config/{postgresql.conf => postgresql.production.conf} (100%) create mode 100644 images/db/config/postgresql.staging.conf create mode 100755 images/db/start.sh diff --git a/images/db/Dockerfile b/images/db/Dockerfile index 602bb010..15bcc8a2 100644 --- a/images/db/Dockerfile +++ b/images/db/Dockerfile @@ -16,14 +16,7 @@ ADD lib/quad_tile/ lib/quad_tile/ RUN make -C db/functions/ RUN chown -R postgres lib/ RUN chown -R postgres db/ +COPY start.sh /usr/local/bin/ +COPY config/postgresql.*.conf /etc/postgresql/ -## Validate postgresql.conf file -COPY config/postgresql.conf /etc/postgresql/postgresql.conf -RUN mkdir /var/lib/postgresql/test_data -RUN chown postgres:postgres /var/lib/postgresql/test_data -USER postgres -RUN initdb -D /var/lib/postgresql/test_data -USER root - -# Set the default command to run PostgreSQL -CMD ["postgres", "-c", "config_file=/etc/postgresql/postgresql.conf"] \ No newline at end of file +CMD ["/usr/local/bin/start.sh"] diff --git a/images/db/config/postgresql.conf b/images/db/config/postgresql.production.conf similarity index 100% rename from images/db/config/postgresql.conf rename to images/db/config/postgresql.production.conf diff --git a/images/db/config/postgresql.staging.conf b/images/db/config/postgresql.staging.conf new file mode 100644 index 00000000..e558b150 --- /dev/null +++ b/images/db/config/postgresql.staging.conf @@ -0,0 +1,798 @@ +# ----------------------------- +# PostgreSQL configuration file +# ----------------------------- +# +# This file consists of lines of the form: +# +# name = value +# +# (The "=" is optional.) Whitespace may be used. Comments are introduced with +# "#" anywhere on a line. The complete list of parameter names and allowed +# values can be found in the PostgreSQL documentation. +# +# The commented-out settings shown in this file represent the default values. +# Re-commenting a setting is NOT sufficient to revert it to the default value; +# you need to reload the server. +# +# This file is read on server startup and when the server receives a SIGHUP +# signal. If you edit the file on a running system, you have to SIGHUP the +# server for the changes to take effect, run "pg_ctl reload", or execute +# "SELECT pg_reload_conf()". Some parameters, which are marked below, +# require a server shutdown and restart to take effect. +# +# Any parameter can also be given as a command-line option to the server, e.g., +# "postgres -c log_connections=on". Some parameters can be changed at run time +# with the "SET" SQL command. +# +# Memory units: B = bytes Time units: us = microseconds +# kB = kilobytes ms = milliseconds +# MB = megabytes s = seconds +# GB = gigabytes min = minutes +# TB = terabytes h = hours +# d = days + + +#------------------------------------------------------------------------------ +# FILE LOCATIONS +#------------------------------------------------------------------------------ + +# The default values of these variables are driven from the -D command-line +# option or PGDATA environment variable, represented here as ConfigDir. + +#data_directory = 'ConfigDir' # use data in another directory + # (change requires restart) +#hba_file = 'ConfigDir/pg_hba.conf' # host-based authentication file + # (change requires restart) +#ident_file = 'ConfigDir/pg_ident.conf' # ident configuration file + # (change requires restart) + +# If external_pid_file is not explicitly set, no extra PID file is written. +#external_pid_file = '' # write an extra PID file + # (change requires restart) + + +#------------------------------------------------------------------------------ +# CONNECTIONS AND AUTHENTICATION +#------------------------------------------------------------------------------ + +# - Connection Settings - + +listen_addresses = '*' + # comma-separated list of addresses; + # defaults to 'localhost'; use '*' for all + # (change requires restart) +#port = 5432 # (change requires restart) +max_connections = 100 # (change requires restart) +#superuser_reserved_connections = 3 # (change requires restart) +#unix_socket_directories = '/var/run/postgresql' # comma-separated list of directories + # (change requires restart) +#unix_socket_group = '' # (change requires restart) +#unix_socket_permissions = 0777 # begin with 0 to use octal notation + # (change requires restart) +#bonjour = off # advertise server via Bonjour + # (change requires restart) +#bonjour_name = '' # defaults to the computer name + # (change requires restart) + +# - TCP settings - +# see "man tcp" for details + +#tcp_keepalives_idle = 0 # TCP_KEEPIDLE, in seconds; + # 0 selects the system default +#tcp_keepalives_interval = 0 # TCP_KEEPINTVL, in seconds; + # 0 selects the system default +#tcp_keepalives_count = 0 # TCP_KEEPCNT; + # 0 selects the system default +#tcp_user_timeout = 0 # TCP_USER_TIMEOUT, in milliseconds; + # 0 selects the system default + +#client_connection_check_interval = 0 # time between checks for client + # disconnection while running queries; + # 0 for never + +# - Authentication - + +#authentication_timeout = 1min # 1s-600s +#password_encryption = scram-sha-256 # scram-sha-256 or md5 +#db_user_namespace = off + +# GSSAPI using Kerberos +#krb_server_keyfile = 'FILE:${sysconfdir}/krb5.keytab' +#krb_caseins_users = off + +# - SSL - + +#ssl = off +#ssl_ca_file = '' +#ssl_cert_file = 'server.crt' +#ssl_crl_file = '' +#ssl_crl_dir = '' +#ssl_key_file = 'server.key' +#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers +#ssl_prefer_server_ciphers = on +#ssl_ecdh_curve = 'prime256v1' +#ssl_min_protocol_version = 'TLSv1.2' +#ssl_max_protocol_version = '' +#ssl_dh_params_file = '' +#ssl_passphrase_command = '' +#ssl_passphrase_command_supports_reload = off + + +#------------------------------------------------------------------------------ +# RESOURCE USAGE (except WAL) +#------------------------------------------------------------------------------ + +# - Memory - + +shared_buffers = 128MB # min 128kB + # (change requires restart) +#huge_pages = try # on, off, or try + # (change requires restart) +#huge_page_size = 0 # zero for system default + # (change requires restart) +#temp_buffers = 8MB # min 800kB +#max_prepared_transactions = 0 # zero disables the feature + # (change requires restart) +# Caution: it is not advisable to set max_prepared_transactions nonzero unless +# you actively intend to use prepared transactions. +#work_mem = 4MB # min 64kB +#hash_mem_multiplier = 1.0 # 1-1000.0 multiplier on hash table work_mem +#maintenance_work_mem = 64MB # min 1MB +#autovacuum_work_mem = -1 # min 1MB, or -1 to use maintenance_work_mem +#logical_decoding_work_mem = 64MB # min 64kB +#max_stack_depth = 2MB # min 100kB +#shared_memory_type = mmap # the default is the first option + # supported by the operating system: + # mmap + # sysv + # windows + # (change requires restart) +dynamic_shared_memory_type = posix # the default is the first option + # supported by the operating system: + # posix + # sysv + # windows + # mmap + # (change requires restart) +#min_dynamic_shared_memory = 0MB # (change requires restart) + +# - Disk - + +#temp_file_limit = -1 # limits per-process temp file space + # in kilobytes, or -1 for no limit + +# - Kernel Resources - + +#max_files_per_process = 1000 # min 64 + # (change requires restart) + +# - Cost-Based Vacuum Delay - + +#vacuum_cost_delay = 0 # 0-100 milliseconds (0 disables) +#vacuum_cost_page_hit = 1 # 0-10000 credits +#vacuum_cost_page_miss = 2 # 0-10000 credits +#vacuum_cost_page_dirty = 20 # 0-10000 credits +#vacuum_cost_limit = 200 # 1-10000 credits + +# - Background Writer - + +#bgwriter_delay = 200ms # 10-10000ms between rounds +#bgwriter_lru_maxpages = 100 # max buffers written/round, 0 disables +#bgwriter_lru_multiplier = 2.0 # 0-10.0 multiplier on buffers scanned/round +#bgwriter_flush_after = 512kB # measured in pages, 0 disables + +# - Asynchronous Behavior - + +#backend_flush_after = 0 # measured in pages, 0 disables +#effective_io_concurrency = 1 # 1-1000; 0 disables prefetching +#maintenance_io_concurrency = 10 # 1-1000; 0 disables prefetching +#max_worker_processes = 8 # (change requires restart) +#max_parallel_workers_per_gather = 2 # taken from max_parallel_workers +#max_parallel_maintenance_workers = 2 # taken from max_parallel_workers +#max_parallel_workers = 8 # maximum number of max_worker_processes that + # can be used in parallel operations +#parallel_leader_participation = on +#old_snapshot_threshold = -1 # 1min-60d; -1 disables; 0 is immediate + # (change requires restart) + + +#------------------------------------------------------------------------------ +# WRITE-AHEAD LOG +#------------------------------------------------------------------------------ + +# - Settings - + +#wal_level = replica # minimal, replica, or logical + # (change requires restart) +#fsync = on # flush data to disk for crash safety + # (turning this off can cause + # unrecoverable data corruption) +#synchronous_commit = on # synchronization level; + # off, local, remote_write, remote_apply, or on +#wal_sync_method = fsync # the default is the first option + # supported by the operating system: + # open_datasync + # fdatasync (default on Linux and FreeBSD) + # fsync + # fsync_writethrough + # open_sync +#full_page_writes = on # recover from partial page writes +#wal_log_hints = off # also do full page writes of non-critical updates + # (change requires restart) +#wal_compression = off # enable compression of full-page writes +#wal_init_zero = on # zero-fill new WAL files +#wal_recycle = on # recycle WAL files +#wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers + # (change requires restart) +#wal_writer_delay = 200ms # 1-10000 milliseconds +#wal_writer_flush_after = 1MB # measured in pages, 0 disables +#wal_skip_threshold = 2MB + +#commit_delay = 0 # range 0-100000, in microseconds +#commit_siblings = 5 # range 1-1000 + +# - Checkpoints - + +#checkpoint_timeout = 5min # range 30s-1d +#checkpoint_completion_target = 0.9 # checkpoint target duration, 0.0 - 1.0 +#checkpoint_flush_after = 256kB # measured in pages, 0 disables +#checkpoint_warning = 30s # 0 disables +max_wal_size = 1GB +min_wal_size = 80MB + +# - Archiving - + +#archive_mode = off # enables archiving; off, on, or always + # (change requires restart) +#archive_command = '' # command to use to archive a logfile segment + # placeholders: %p = path of file to archive + # %f = file name only + # e.g. 'test ! -f /mnt/server/archivedir/%f && cp %p /mnt/server/archivedir/%f' +#archive_timeout = 0 # force a logfile segment switch after this + # number of seconds; 0 disables + +# - Archive Recovery - + +# These are only used in recovery mode. + +#restore_command = '' # command to use to restore an archived logfile segment + # placeholders: %p = path of file to restore + # %f = file name only + # e.g. 'cp /mnt/server/archivedir/%f %p' +#archive_cleanup_command = '' # command to execute at every restartpoint +#recovery_end_command = '' # command to execute at completion of recovery + +# - Recovery Target - + +# Set these only when performing a targeted recovery. + +#recovery_target = '' # 'immediate' to end recovery as soon as a + # consistent state is reached + # (change requires restart) +#recovery_target_name = '' # the named restore point to which recovery will proceed + # (change requires restart) +#recovery_target_time = '' # the time stamp up to which recovery will proceed + # (change requires restart) +#recovery_target_xid = '' # the transaction ID up to which recovery will proceed + # (change requires restart) +#recovery_target_lsn = '' # the WAL LSN up to which recovery will proceed + # (change requires restart) +#recovery_target_inclusive = on # Specifies whether to stop: + # just after the specified recovery target (on) + # just before the recovery target (off) + # (change requires restart) +#recovery_target_timeline = 'latest' # 'current', 'latest', or timeline ID + # (change requires restart) +#recovery_target_action = 'pause' # 'pause', 'promote', 'shutdown' + # (change requires restart) + + +#------------------------------------------------------------------------------ +# REPLICATION +#------------------------------------------------------------------------------ + +# - Sending Servers - + +# Set these on the primary and on any standby that will send replication data. + +#max_wal_senders = 10 # max number of walsender processes + # (change requires restart) +#max_replication_slots = 10 # max number of replication slots + # (change requires restart) +#wal_keep_size = 0 # in megabytes; 0 disables +#max_slot_wal_keep_size = -1 # in megabytes; -1 disables +#wal_sender_timeout = 60s # in milliseconds; 0 disables +#track_commit_timestamp = off # collect timestamp of transaction commit + # (change requires restart) + +# - Primary Server - + +# These settings are ignored on a standby server. + +#synchronous_standby_names = '' # standby servers that provide sync rep + # method to choose sync standbys, number of sync standbys, + # and comma-separated list of application_name + # from standby(s); '*' = all +#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed + +# - Standby Servers - + +# These settings are ignored on a primary server. + +#primary_conninfo = '' # connection string to sending server +#primary_slot_name = '' # replication slot on sending server +#promote_trigger_file = '' # file name whose presence ends recovery +#hot_standby = on # "off" disallows queries during recovery + # (change requires restart) +#max_standby_archive_delay = 30s # max delay before canceling queries + # when reading WAL from archive; + # -1 allows indefinite delay +#max_standby_streaming_delay = 30s # max delay before canceling queries + # when reading streaming WAL; + # -1 allows indefinite delay +#wal_receiver_create_temp_slot = off # create temp slot if primary_slot_name + # is not set +#wal_receiver_status_interval = 10s # send replies at least this often + # 0 disables +#hot_standby_feedback = off # send info from standby to prevent + # query conflicts +#wal_receiver_timeout = 60s # time that receiver waits for + # communication from primary + # in milliseconds; 0 disables +#wal_retrieve_retry_interval = 5s # time to wait before retrying to + # retrieve WAL after a failed attempt +#recovery_min_apply_delay = 0 # minimum delay for applying changes during recovery + +# - Subscribers - + +# These settings are ignored on a publisher. + +#max_logical_replication_workers = 4 # taken from max_worker_processes + # (change requires restart) +#max_sync_workers_per_subscription = 2 # taken from max_logical_replication_workers + + +#------------------------------------------------------------------------------ +# QUERY TUNING +#------------------------------------------------------------------------------ + +# - Planner Method Configuration - + +#enable_async_append = on +#enable_bitmapscan = on +#enable_gathermerge = on +#enable_hashagg = on +#enable_hashjoin = on +#enable_incremental_sort = on +#enable_indexscan = on +#enable_indexonlyscan = on +#enable_material = on +#enable_memoize = on +#enable_mergejoin = on +#enable_nestloop = on +#enable_parallel_append = on +#enable_parallel_hash = on +#enable_partition_pruning = on +#enable_partitionwise_join = off +#enable_partitionwise_aggregate = off +#enable_seqscan = on +#enable_sort = on +#enable_tidscan = on + +# - Planner Cost Constants - + +#seq_page_cost = 1.0 # measured on an arbitrary scale +#random_page_cost = 4.0 # same scale as above +#cpu_tuple_cost = 0.01 # same scale as above +#cpu_index_tuple_cost = 0.005 # same scale as above +#cpu_operator_cost = 0.0025 # same scale as above +#parallel_setup_cost = 1000.0 # same scale as above +#parallel_tuple_cost = 0.1 # same scale as above +#min_parallel_table_scan_size = 8MB +#min_parallel_index_scan_size = 512kB +#effective_cache_size = 4GB + +#jit_above_cost = 100000 # perform JIT compilation if available + # and query more expensive than this; + # -1 disables +#jit_inline_above_cost = 500000 # inline small functions if query is + # more expensive than this; -1 disables +#jit_optimize_above_cost = 500000 # use expensive JIT optimizations if + # query is more expensive than this; + # -1 disables + +# - Genetic Query Optimizer - + +#geqo = on +#geqo_threshold = 12 +#geqo_effort = 5 # range 1-10 +#geqo_pool_size = 0 # selects default based on effort +#geqo_generations = 0 # selects default based on effort +#geqo_selection_bias = 2.0 # range 1.5-2.0 +#geqo_seed = 0.0 # range 0.0-1.0 + +# - Other Planner Options - + +#default_statistics_target = 100 # range 1-10000 +#constraint_exclusion = partition # on, off, or partition +#cursor_tuple_fraction = 0.1 # range 0.0-1.0 +#from_collapse_limit = 8 +#jit = on # allow JIT compilation +#join_collapse_limit = 8 # 1 disables collapsing of explicit + # JOIN clauses +#plan_cache_mode = auto # auto, force_generic_plan or + # force_custom_plan + + +#------------------------------------------------------------------------------ +# REPORTING AND LOGGING +#------------------------------------------------------------------------------ + +# - Where to Log - + +#log_destination = 'stderr' # Valid values are combinations of + # stderr, csvlog, syslog, and eventlog, + # depending on platform. csvlog + # requires logging_collector to be on. + +# This is used when logging to stderr: +#logging_collector = off # Enable capturing of stderr and csvlog + # into log files. Required to be on for + # csvlogs. + # (change requires restart) + +# These are only used if logging_collector is on: +#log_directory = 'log' # directory where log files are written, + # can be absolute or relative to PGDATA +#log_filename = 'postgresql-%Y-%m-%d_%H%M%S.log' # log file name pattern, + # can include strftime() escapes +#log_file_mode = 0600 # creation mode for log files, + # begin with 0 to use octal notation +#log_rotation_age = 1d # Automatic rotation of logfiles will + # happen after that time. 0 disables. +#log_rotation_size = 10MB # Automatic rotation of logfiles will + # happen after that much log output. + # 0 disables. +#log_truncate_on_rotation = off # If on, an existing log file with the + # same name as the new log file will be + # truncated rather than appended to. + # But such truncation only occurs on + # time-driven rotation, not on restarts + # or size-driven rotation. Default is + # off, meaning append to existing files + # in all cases. + +# These are relevant when logging to syslog: +#syslog_facility = 'LOCAL0' +#syslog_ident = 'postgres' +#syslog_sequence_numbers = on +#syslog_split_messages = on + +# This is only relevant when logging to eventlog (Windows): +# (change requires restart) +#event_source = 'PostgreSQL' + +# - When to Log - + +#log_min_messages = warning # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic + +#log_min_error_statement = error # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # info + # notice + # warning + # error + # log + # fatal + # panic (effectively off) + +#log_min_duration_statement = -1 # -1 is disabled, 0 logs all statements + # and their durations, > 0 logs only + # statements running at least this number + # of milliseconds + +#log_min_duration_sample = -1 # -1 is disabled, 0 logs a sample of statements + # and their durations, > 0 logs only a sample of + # statements running at least this number + # of milliseconds; + # sample fraction is determined by log_statement_sample_rate + +#log_statement_sample_rate = 1.0 # fraction of logged statements exceeding + # log_min_duration_sample to be logged; + # 1.0 logs all such statements, 0.0 never logs + + +#log_transaction_sample_rate = 0.0 # fraction of transactions whose statements + # are logged regardless of their duration; 1.0 logs all + # statements from all transactions, 0.0 never logs + +# - What to Log - + +#debug_print_parse = off +#debug_print_rewritten = off +#debug_print_plan = off +#debug_pretty_print = on +#log_autovacuum_min_duration = -1 # log autovacuum activity; + # -1 disables, 0 logs all actions and + # their durations, > 0 logs only + # actions running at least this number + # of milliseconds. +#log_checkpoints = off +#log_connections = off +#log_disconnections = off +#log_duration = off +#log_error_verbosity = default # terse, default, or verbose messages +#log_hostname = off +#log_line_prefix = '%m [%p] ' # special values: + # %a = application name + # %u = user name + # %d = database name + # %r = remote host and port + # %h = remote host + # %b = backend type + # %p = process ID + # %P = process ID of parallel group leader + # %t = timestamp without milliseconds + # %m = timestamp with milliseconds + # %n = timestamp with milliseconds (as a Unix epoch) + # %Q = query ID (0 if none or not computed) + # %i = command tag + # %e = SQL state + # %c = session ID + # %l = session line number + # %s = session start timestamp + # %v = virtual transaction ID + # %x = transaction ID (0 if none) + # %q = stop here in non-session + # processes + # %% = '%' + # e.g. '<%u%%%d> ' +#log_lock_waits = off # log lock waits >= deadlock_timeout +#log_recovery_conflict_waits = off # log standby recovery conflict waits + # >= deadlock_timeout +#log_parameter_max_length = -1 # when logging statements, limit logged + # bind-parameter values to N bytes; + # -1 means print in full, 0 disables +#log_parameter_max_length_on_error = 0 # when logging an error, limit logged + # bind-parameter values to N bytes; + # -1 means print in full, 0 disables +#log_statement = 'none' # none, ddl, mod, all +#log_replication_commands = off +#log_temp_files = -1 # log temporary files equal or larger + # than the specified size in kilobytes; + # -1 disables, 0 logs all temp files +log_timezone = 'Etc/UTC' + + +#------------------------------------------------------------------------------ +# PROCESS TITLE +#------------------------------------------------------------------------------ + +#cluster_name = '' # added to process titles if nonempty + # (change requires restart) +#update_process_title = on + + +#------------------------------------------------------------------------------ +# STATISTICS +#------------------------------------------------------------------------------ + +# - Query and Index Statistics Collector - + +#track_activities = on +#track_activity_query_size = 1024 # (change requires restart) +#track_counts = on +#track_io_timing = off +#track_wal_io_timing = off +#track_functions = none # none, pl, all +#stats_temp_directory = 'pg_stat_tmp' + + +# - Monitoring - + +#compute_query_id = auto +#log_statement_stats = off +#log_parser_stats = off +#log_planner_stats = off +#log_executor_stats = off + + +#------------------------------------------------------------------------------ +# AUTOVACUUM +#------------------------------------------------------------------------------ + +#autovacuum = on # Enable autovacuum subprocess? 'on' + # requires track_counts to also be on. +#autovacuum_max_workers = 3 # max number of autovacuum subprocesses + # (change requires restart) +#autovacuum_naptime = 1min # time between autovacuum runs +#autovacuum_vacuum_threshold = 50 # min number of row updates before + # vacuum +#autovacuum_vacuum_insert_threshold = 1000 # min number of row inserts + # before vacuum; -1 disables insert + # vacuums +#autovacuum_analyze_threshold = 50 # min number of row updates before + # analyze +#autovacuum_vacuum_scale_factor = 0.2 # fraction of table size before vacuum +#autovacuum_vacuum_insert_scale_factor = 0.2 # fraction of inserts over table + # size before insert vacuum +#autovacuum_analyze_scale_factor = 0.1 # fraction of table size before analyze +#autovacuum_freeze_max_age = 200000000 # maximum XID age before forced vacuum + # (change requires restart) +#autovacuum_multixact_freeze_max_age = 400000000 # maximum multixact age + # before forced vacuum + # (change requires restart) +#autovacuum_vacuum_cost_delay = 2ms # default vacuum cost delay for + # autovacuum, in milliseconds; + # -1 means use vacuum_cost_delay +#autovacuum_vacuum_cost_limit = -1 # default vacuum cost limit for + # autovacuum, -1 means use + # vacuum_cost_limit + + +#------------------------------------------------------------------------------ +# CLIENT CONNECTION DEFAULTS +#------------------------------------------------------------------------------ + +# - Statement Behavior - + +#client_min_messages = notice # values in order of decreasing detail: + # debug5 + # debug4 + # debug3 + # debug2 + # debug1 + # log + # notice + # warning + # error +#search_path = '"$user", public' # schema names +#row_security = on +#default_table_access_method = 'heap' +#default_tablespace = '' # a tablespace name, '' uses the default +#default_toast_compression = 'pglz' # 'pglz' or 'lz4' +#temp_tablespaces = '' # a list of tablespace names, '' uses + # only default tablespace +#check_function_bodies = on +#default_transaction_isolation = 'read committed' +#default_transaction_read_only = off +#default_transaction_deferrable = off +#session_replication_role = 'origin' +#statement_timeout = 0 # in milliseconds, 0 is disabled +#lock_timeout = 0 # in milliseconds, 0 is disabled +#idle_in_transaction_session_timeout = 0 # in milliseconds, 0 is disabled +#idle_session_timeout = 0 # in milliseconds, 0 is disabled +#vacuum_freeze_table_age = 150000000 +#vacuum_freeze_min_age = 50000000 +#vacuum_failsafe_age = 1600000000 +#vacuum_multixact_freeze_table_age = 150000000 +#vacuum_multixact_freeze_min_age = 5000000 +#vacuum_multixact_failsafe_age = 1600000000 +#bytea_output = 'hex' # hex, escape +#xmlbinary = 'base64' +#xmloption = 'content' +#gin_pending_list_limit = 4MB + +# - Locale and Formatting - + +datestyle = 'iso, mdy' +#intervalstyle = 'postgres' +timezone = 'Etc/UTC' +#timezone_abbreviations = 'Default' # Select the set of available time zone + # abbreviations. Currently, there are + # Default + # Australia (historical usage) + # India + # You can create your own file in + # share/timezonesets/. +#extra_float_digits = 1 # min -15, max 3; any value >0 actually + # selects precise output mode +#client_encoding = sql_ascii # actually, defaults to database + # encoding + +# These settings are initialized by initdb, but they can be changed. +lc_messages = 'en_US.utf8' # locale for system error message + # strings +lc_monetary = 'en_US.utf8' # locale for monetary formatting +lc_numeric = 'en_US.utf8' # locale for number formatting +lc_time = 'en_US.utf8' # locale for time formatting + +# default configuration for text search +default_text_search_config = 'pg_catalog.english' + +# - Shared Library Preloading - + +#local_preload_libraries = '' +#session_preload_libraries = '' +#shared_preload_libraries = '' # (change requires restart) +#jit_provider = 'llvmjit' # JIT library to use + +# - Other Defaults - + +#dynamic_library_path = '$libdir' +#extension_destdir = '' # prepend path when loading extensions + # and shared objects (added by Debian) +#gin_fuzzy_search_limit = 0 + + +#------------------------------------------------------------------------------ +# LOCK MANAGEMENT +#------------------------------------------------------------------------------ + +#deadlock_timeout = 1s +#max_locks_per_transaction = 64 # min 10 + # (change requires restart) +#max_pred_locks_per_transaction = 64 # min 10 + # (change requires restart) +#max_pred_locks_per_relation = -2 # negative values mean + # (max_pred_locks_per_transaction + # / -max_pred_locks_per_relation) - 1 +#max_pred_locks_per_page = 2 # min 0 + + +#------------------------------------------------------------------------------ +# VERSION AND PLATFORM COMPATIBILITY +#------------------------------------------------------------------------------ + +# - Previous PostgreSQL Versions - + +#array_nulls = on +#backslash_quote = safe_encoding # on, off, or safe_encoding +#escape_string_warning = on +#lo_compat_privileges = off +#quote_all_identifiers = off +#standard_conforming_strings = on +#synchronize_seqscans = on + +# - Other Platforms and Clients - + +#transform_null_equals = off + + +#------------------------------------------------------------------------------ +# ERROR HANDLING +#------------------------------------------------------------------------------ + +#exit_on_error = off # terminate session on any error? +#restart_after_crash = on # reinitialize after backend crash? +#data_sync_retry = off # retry or panic on failure to fsync + # data? + # (change requires restart) +#recovery_init_sync_method = fsync # fsync, syncfs (Linux 5.8+) + + +#------------------------------------------------------------------------------ +# CONFIG FILE INCLUDES +#------------------------------------------------------------------------------ + +# These options allow settings to be loaded from files other than the +# default postgresql.conf. Note that these are directives, not variable +# assignments, so they can usefully be given more than once. + +#include_dir = '...' # include files ending in '.conf' from + # a directory, e.g., 'conf.d' +#include_if_exists = '...' # include file only if it exists +#include = '...' # include file + + +#------------------------------------------------------------------------------ +# CUSTOMIZED OPTIONS +#------------------------------------------------------------------------------ + +# Add settings for extensions here \ No newline at end of file diff --git a/images/db/start.sh b/images/db/start.sh new file mode 100755 index 00000000..b135559c --- /dev/null +++ b/images/db/start.sh @@ -0,0 +1,5 @@ +#!/bin/bash +ENVIRONMENT=${ENVIRONMENT:-production} +CONFIG_FILE=/etc/postgresql/postgresql.${ENVIRONMENT}.conf +echo "Starting PostgreSQL using ${CONFIG_FILE}" +exec su postgres -c "postgres -c config_file=${CONFIG_FILE}" diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 02fa9f8d..1bddd11d 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n782.hb589921' + version: '0.1.0-n780.hfdf7465' repository: https://devseed.com/osm-seed-chart/ diff --git a/values.production.template.yaml b/values.production.template.yaml index 693a3b48..714eb320 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -63,6 +63,7 @@ osm-seed: POSTGRES_DB: {{PRODUCTION_DB}} POSTGRES_USER: {{PRODUCTION_DB_USER}} POSTGRES_PASSWORD: {{PRODUCTION_DB_PASSWORD}} + ENVIRONMENT: production persistenceDisk: enabled: true accessMode: ReadWriteOnce diff --git a/values.staging.template.yaml b/values.staging.template.yaml index f580484b..6cf5db01 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -73,6 +73,7 @@ osm-seed: POSTGRES_DB: {{STAGING_DB}} POSTGRES_USER: {{STAGING_DB_USER}} POSTGRES_PASSWORD: {{STAGING_DB_PASSWORD}} + ENVIRONMENT: staging persistenceDisk: enabled: true accessMode: ReadWriteOnce @@ -369,7 +370,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-d # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-0040b8dd143c850ba + AWS_ElasticBlockStore_volumeID : vol-04bd6221877d63c10 AWS_ElasticBlockStore_size: 200Gi resources: enabled: false @@ -405,7 +406,7 @@ osm-seed: accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-00b9ffae1cef059bd + AWS_ElasticBlockStore_volumeID: vol-0fd7014bd185f260c AWS_ElasticBlockStore_size: 100Gi resources: enabled: false From 3ed7e4c87ba2378a7a11165323846f9f94afe25f Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 25 Apr 2024 20:18:38 -0500 Subject: [PATCH 14/31] Update osm-seed version and env vars --- ohm/requirements.yaml | 2 +- values.production.template.yaml | 1 - values.staging.template.yaml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 1bddd11d..205b7725 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n780.hfdf7465' + version: '0.1.0-n784.h0730e0d' repository: https://devseed.com/osm-seed-chart/ diff --git a/values.production.template.yaml b/values.production.template.yaml index 714eb320..693a3b48 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -63,7 +63,6 @@ osm-seed: POSTGRES_DB: {{PRODUCTION_DB}} POSTGRES_USER: {{PRODUCTION_DB_USER}} POSTGRES_PASSWORD: {{PRODUCTION_DB_PASSWORD}} - ENVIRONMENT: production persistenceDisk: enabled: true accessMode: ReadWriteOnce diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 6cf5db01..60de1cd9 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -73,7 +73,6 @@ osm-seed: POSTGRES_DB: {{STAGING_DB}} POSTGRES_USER: {{STAGING_DB_USER}} POSTGRES_PASSWORD: {{STAGING_DB_PASSWORD}} - ENVIRONMENT: staging persistenceDisk: enabled: true accessMode: ReadWriteOnce From fa126f617ea653c96a5b36b98c7ea3a3579cd27d Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 25 Apr 2024 20:43:10 -0500 Subject: [PATCH 15/31] Update ebs for tiler and use prod replication files --- values.staging.template.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 60de1cd9..048b20a5 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -369,7 +369,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-d # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-04bd6221877d63c10 + AWS_ElasticBlockStore_volumeID : vol-07d6e891f6f4b788a AWS_ElasticBlockStore_size: 200Gi resources: enabled: false @@ -395,9 +395,9 @@ osm-seed: label_value: web env: TILER_IMPORT_FROM: osm - TILER_IMPORT_PBF_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/planet/planet-latest.osm.pbf - REPLICATION_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/replication/minute/ - SEQUENCE_NUMBER: "675000" + TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-240416_0002.osm.pbf + REPLICATION_URL: http://s3.amazonaws.com/planet.openhistoricalmap.org/replication/minute/ + SEQUENCE_NUMBER: "1368000" OVERWRITE_STATE: false UPLOAD_EXPIRED_FILES: true persistenceDisk: @@ -405,7 +405,7 @@ osm-seed: accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-0fd7014bd185f260c + AWS_ElasticBlockStore_volumeID: vol-0a865ef660ed18256 AWS_ElasticBlockStore_size: 100Gi resources: enabled: false From 8db15a25a64067f9712caa4a2ae57d6cc77d3cfe Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 25 Apr 2024 21:43:01 -0500 Subject: [PATCH 16/31] Disable osmcha - staging --- values.staging.template.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 048b20a5..11045d47 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -754,12 +754,12 @@ osm-seed: # Variables for osmcha web # ==================================================================================================== osmchaWeb: - enabled: true + enabled: false # ==================================================================================================== # Variables for osmcha Api, We hard code the container id. # ==================================================================================================== osmchaApi: - enabled: true + enabled: false image: name: "ghcr.io/openhistoricalmap/osmcha-django" tag: "a1bcea85dc1f7c27566c20bafe7fff7aaa1e38a4" @@ -798,7 +798,7 @@ osm-seed: # Variables for osmcha DB # ==================================================================================================== osmchaDb: - enabled: true + enabled: false image: name: "developmentseed/osmseed-osmcha-db" tag: "0.1.0-n767.h0090e97" From 7d4e6f8ec89ba194e6eb453fc3c151a9f09ea774 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 26 Apr 2024 11:48:28 -0500 Subject: [PATCH 17/31] Test PBF planet files from latest api-db --- ohm/requirements.yaml | 2 +- values.staging.template.yaml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 205b7725..0fb90b1c 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n784.h0730e0d' + version: '0.1.0-n785.hc9f71b6' repository: https://devseed.com/osm-seed-chart/ diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 11045d47..0c5e06a5 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -369,7 +369,7 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-d # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : vol-07d6e891f6f4b788a + AWS_ElasticBlockStore_volumeID : vol-03294367f2687c585 AWS_ElasticBlockStore_size: 200Gi resources: enabled: false @@ -380,9 +380,9 @@ osm-seed: memory: '8Gi' cpu: '2' nodeSelector: - enabled: false + enabled: true label_key: nodegroup_type - label_value: db + label_value: job_xlarge # ==================================================================================================== # Variables for tiler-imposm # ==================================================================================================== @@ -392,11 +392,11 @@ osm-seed: nodeSelector: enabled: false label_key: nodegroup_type - label_value: web + label_value: job_xlarge env: TILER_IMPORT_FROM: osm - TILER_IMPORT_PBF_URL: https://s3.amazonaws.com/planet.openhistoricalmap.org/planet/planet-240416_0002.osm.pbf - REPLICATION_URL: http://s3.amazonaws.com/planet.openhistoricalmap.org/replication/minute/ + TILER_IMPORT_PBF_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/planet/planet-latest.osm.pbf + REPLICATION_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/replication/minute/ SEQUENCE_NUMBER: "1368000" OVERWRITE_STATE: false UPLOAD_EXPIRED_FILES: true @@ -405,7 +405,7 @@ osm-seed: accessMode: ReadWriteOnce mountPath: /mnt/data # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID: vol-0a865ef660ed18256 + AWS_ElasticBlockStore_volumeID: vol-086f2e43e4fa71f00 AWS_ElasticBlockStore_size: 100Gi resources: enabled: false From a9f0f0caf02ca774b380e6f6dcd017b7410ee170 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 26 Apr 2024 12:19:12 -0500 Subject: [PATCH 18/31] Update imposm SEQUENCE_NUMBER - staging --- values.staging.template.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 0c5e06a5..4331bf34 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -397,9 +397,11 @@ osm-seed: TILER_IMPORT_FROM: osm TILER_IMPORT_PBF_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/planet/planet-latest.osm.pbf REPLICATION_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/replication/minute/ - SEQUENCE_NUMBER: "1368000" - OVERWRITE_STATE: false + SEQUENCE_NUMBER: "675000" + OVERWRITE_STATE: true UPLOAD_EXPIRED_FILES: true + IMPORT_NATURAL_EARTH: true + IMPORT_OSM_LAND: true persistenceDisk: enabled: true accessMode: ReadWriteOnce From 5488b1e15dd8ca6f7f19ea0634a856428a52bf90 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Mon, 29 Apr 2024 12:41:02 -0500 Subject: [PATCH 19/31] Update resources for staging tiler --- values.staging.template.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/values.staging.template.yaml b/values.staging.template.yaml index 4331bf34..253cef68 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -382,7 +382,7 @@ osm-seed: nodeSelector: enabled: true label_key: nodegroup_type - label_value: job_xlarge + label_value: db # ==================================================================================================== # Variables for tiler-imposm # ==================================================================================================== @@ -390,9 +390,9 @@ osm-seed: tilerImposm: enabled: true nodeSelector: - enabled: false + enabled: true label_key: nodegroup_type - label_value: job_xlarge + label_value: db env: TILER_IMPORT_FROM: osm TILER_IMPORT_PBF_URL: http://planet-staging.openhistoricalmap.org.s3.amazonaws.com/planet/planet-latest.osm.pbf @@ -459,7 +459,7 @@ osm-seed: memory: "10Gi" cpu: "2" autoscaling: - enabled: true + enabled: false minReplicas: 1 maxReplicas: 2 cpuUtilization: 60 @@ -692,7 +692,7 @@ osm-seed: enabled: true schedule: "0 0 * * 0" # every 7 days nodeSelector: - enabled: true + enabled: false label_key: nodegroup_type label_value: job_xlarge # ==================================================================================================== From 92d19d095d2fa4e258a25f74fb59729ea792ef20 Mon Sep 17 00:00:00 2001 From: Eric Theise Date: Mon, 29 Apr 2024 14:34:04 -0700 Subject: [PATCH 20/31] Update Dockerfile Updates for issues about mastodon url (#621) and translating privacy page (#743), and routine translations to staging. --- images/web/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/web/Dockerfile b/images/web/Dockerfile index b9c5eb16..348b1a73 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=3648249b7d408253b0c7b19fef8fcf5591dd68ef +ENV OPENHISTORICALMAP_WEBSITE_GITSHA=5e5b7468c97b5e71270f36b538f1f1960f31ecd3 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 'fix for 737, month and day clear when year changed in iD' +RUN echo 'updates for issues about mastodon url (#621) and translating privacy page (#743), translations' RUN git fetch # Install Ruby packages From 6496b14bab61ec0e3ce35fb241b7200a7a3ca616 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 30 Apr 2024 12:08:46 -0500 Subject: [PATCH 21/31] Update osm-seed version taginfo --- ohm/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 0fb90b1c..3d088184 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n785.hc9f71b6' + version: '0.1.0-n786.hf4ba562' repository: https://devseed.com/osm-seed-chart/ From 2fe67a06be2eca235043899da4b426ada218e064 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 30 Apr 2024 14:25:50 -0500 Subject: [PATCH 22/31] Update tiler to displaywaterbody in lower zoom --- .../tiler-server/config/config.template.toml | 6 ++++ .../config/providers/water_areas.toml | 32 ++++++++++++++----- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml index bbe7e0da..599ad514 100644 --- a/images/tiler-server/config/config.template.toml +++ b/images/tiler-server/config/config.template.toml @@ -218,6 +218,12 @@ center = [-74.275329586789, -12.153492567373, 8.0] max_zoom = 20 # Water Areas + [[maps.layers]] + name = "water_areas" + provider_layer = "osm.water_areas_gen0_0-2" + min_zoom = 0 + max_zoom = 2 + [[maps.layers]] name = "water_areas" provider_layer = "osm.water_areas_gen0_3-5" diff --git a/images/tiler-server/config/providers/water_areas.toml b/images/tiler-server/config/providers/water_areas.toml index 3cfef479..3ee874c8 100644 --- a/images/tiler-server/config/providers/water_areas.toml +++ b/images/tiler-server/config/providers/water_areas.toml @@ -1,11 +1,27 @@ -# Simplification for geometries -# Zoom levels 3-5,Tolerance=1000 -# Zoom levels 6-7,Tolerance=500 -# Zoom levels 8-9,Tolerance=200 -# Zoom levels 10-12,Tolerance=50 -# Zoom levels 13-15,Tolerance=5 -# Zoom levels 16-20,Tolerance=0 -# Water bodies > 50,000,000 sqm +[[providers.layers]] +geometry_fieldname = "geometry" +geometry_type = "multipolygon" +id_fieldname = "osm_id" +name = "water_areas_gen0_0-2" +sql = """ +SELECT + ST_AsMVTGeom(ST_Simplify(geometry, 10000), !BBOX!) AS geometry, + ABS(osm_id) as osm_id, + name, + type, + area, + tags->'start_date' as start_date, + tags->'end_date' as end_date, + isodatetodecimaldate(pad_date(tags->'start_date', 'start'), FALSE) AS start_decdate, + isodatetodecimaldate(pad_date(tags->'end_date', 'end'), FALSE) AS end_decdate +FROM + osm_water_areas_gen0 +WHERE + type IN ('water', 'riverbank') + AND area > 100000000 + AND geometry && !BBOX! +""" + [[providers.layers]] geometry_fieldname = "geometry" geometry_type = "multipolygon" From efd96256dbd326b7e1cbb353469f2cb1fcaf16c9 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 30 Apr 2024 17:10:08 -0500 Subject: [PATCH 23/31] Add natural earth - water lakes for tiler --- .../tiler-server/config/config.template.toml | 58 +++++++++++++++++-- .../config/providers/water_areas_ne.toml | 34 +++++++++++ 2 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 images/tiler-server/config/providers/water_areas_ne.toml diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml index 599ad514..cf31c55e 100644 --- a/images/tiler-server/config/config.template.toml +++ b/images/tiler-server/config/config.template.toml @@ -37,6 +37,9 @@ max_connections = 50 [['providers/water_areas.toml']] [['providers/water_lines.toml']] + ###### Water areas NE + [['providers/water_areas_ne.toml']] + ###### Admin boundaries providers [['providers/admin_boundaries.toml']] @@ -70,12 +73,25 @@ max_connections = 50 ###### transport_associated_streets [['providers/transport_associated_streets.toml']] - + +# OpenStreetMap (OSM) +[[providers]] +name = "ne" +type = "mvt_postgis" +host = "${POSTGRES_HOST}" +port = "${POSTGRES_PORT}" +database = "${POSTGRES_DB}" +user = "${POSTGRES_USER}" +password = "${POSTGRES_PASSWORD}" +# srid = 3857 +max_connections = 50 + ###### Water lands ne + [['providers/water_areas_ne.toml']] + [[maps]] name = "osm" attribution = "OpenHistoricalMap" center = [-74.275329586789, -12.153492567373, 8.0] - # Land [[maps.layers]] name = "land" @@ -261,7 +277,6 @@ center = [-74.275329586789, -12.153492567373, 8.0] max_zoom = 20 # Water Lines - [[maps.layers]] name = "water_lines" provider_layer = "osm.water_lines_gen0_6-6" @@ -410,4 +425,39 @@ center = [-74.275329586789, -12.153492567373, 8.0] provider_layer = "osm.transport_associated_streets" min_zoom = 7 max_zoom = 20 - \ No newline at end of file + + +[[maps]] +name = "ne" +attribution = "Natural Earth" +center = [-74.275329586789, -12.153492567373, 8.0] + # Water lakes Natural Earth + [[maps.layers]] + name = "water_areas" + provider_layer = "osm.ne_water_lakes_0-2" + min_zoom = 0 + max_zoom = 2 + + [[maps.layers]] + name = "water_areas" + provider_layer = "osm.ne_water_lakes_3-5" + min_zoom = 3 + max_zoom = 5 + + [[maps.layers]] + name = "water_areas" + provider_layer = "osm.ne_water_lakes_6-10" + min_zoom = 6 + max_zoom = 10 + + [[maps.layers]] + name = "water_areas" + provider_layer = "osm.ne_water_lakes_11-13" + min_zoom = 11 + max_zoom = 13 + + [[maps.layers]] + name = "water_areas" + provider_layer = "osm.ne_water_lakes_14-20" + min_zoom = 14 + max_zoom = 20 \ No newline at end of file diff --git a/images/tiler-server/config/providers/water_areas_ne.toml b/images/tiler-server/config/providers/water_areas_ne.toml new file mode 100644 index 00000000..1df8d00f --- /dev/null +++ b/images/tiler-server/config/providers/water_areas_ne.toml @@ -0,0 +1,34 @@ +[[providers.layers]] +name = "ne_water_lakes_0-2" +geometry_fieldname = "geometry" +geometry_type = "multipolygon" +id_fieldname = "ogc_fid" +sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 1000),!BBOX!) AS geometry, name, ogc_fid FROM ne_50m_lakes WHERE wkb_geometry && !BBOX!" + +[[providers.layers]] +name = "ne_water_lakes_3-5" +geometry_fieldname = "geometry" +geometry_type = "multipolygon" +id_fieldname = "ogc_fid" +sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 500),!BBOX!) AS geometry, name, ogc_fid FROM ne_50m_lakes WHERE wkb_geometry && !BBOX!" + +[[providers.layers]] +name = "ne_water_lakes_6-10" +geometry_fieldname = "geometry" +geometry_type = "multipolygon" +id_fieldname = "ogc_fid" +sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 100),!BBOX!) AS geometry, name, ogc_fid FROM ne_10m_lakes WHERE wkb_geometry && !BBOX!" + +[[providers.layers]] +name = "ne_water_lakes_11-13" +geometry_fieldname = "geometry" +geometry_type = "multipolygon" +id_fieldname = "ogc_fid" +sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 5),!BBOX!) AS geometry, name, ogc_fid FROM ne_10m_lakes WHERE wkb_geometry && !BBOX!" + +[[providers.layers]] +name = "ne_water_lakes_14-20" +geometry_fieldname = "geometry" +geometry_type = "multipolygon" +id_fieldname = "ogc_fid" +sql = "SELECT ST_AsMVTGeom(wkb_geometry,!BBOX!) AS geometry, name, ogc_fid FROM ne_10m_lakes WHERE wkb_geometry && !BBOX!" From 90f7fb08067c756dea230e2bad17005b1918a5cf Mon Sep 17 00:00:00 2001 From: Rub21 Date: Tue, 30 Apr 2024 19:04:21 -0500 Subject: [PATCH 24/31] Natural Earth provider/water-areas zoom 0-10 --- images/tiler-server/config/config.template.toml | 12 ------------ .../config/providers/water_areas_ne.toml | 14 -------------- 2 files changed, 26 deletions(-) diff --git a/images/tiler-server/config/config.template.toml b/images/tiler-server/config/config.template.toml index cf31c55e..6b2285ef 100644 --- a/images/tiler-server/config/config.template.toml +++ b/images/tiler-server/config/config.template.toml @@ -449,15 +449,3 @@ center = [-74.275329586789, -12.153492567373, 8.0] provider_layer = "osm.ne_water_lakes_6-10" min_zoom = 6 max_zoom = 10 - - [[maps.layers]] - name = "water_areas" - provider_layer = "osm.ne_water_lakes_11-13" - min_zoom = 11 - max_zoom = 13 - - [[maps.layers]] - name = "water_areas" - provider_layer = "osm.ne_water_lakes_14-20" - min_zoom = 14 - max_zoom = 20 \ No newline at end of file diff --git a/images/tiler-server/config/providers/water_areas_ne.toml b/images/tiler-server/config/providers/water_areas_ne.toml index 1df8d00f..9b65d19a 100644 --- a/images/tiler-server/config/providers/water_areas_ne.toml +++ b/images/tiler-server/config/providers/water_areas_ne.toml @@ -18,17 +18,3 @@ geometry_fieldname = "geometry" geometry_type = "multipolygon" id_fieldname = "ogc_fid" sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 100),!BBOX!) AS geometry, name, ogc_fid FROM ne_10m_lakes WHERE wkb_geometry && !BBOX!" - -[[providers.layers]] -name = "ne_water_lakes_11-13" -geometry_fieldname = "geometry" -geometry_type = "multipolygon" -id_fieldname = "ogc_fid" -sql = "SELECT ST_AsMVTGeom(ST_Simplify(wkb_geometry, 5),!BBOX!) AS geometry, name, ogc_fid FROM ne_10m_lakes WHERE wkb_geometry && !BBOX!" - -[[providers.layers]] -name = "ne_water_lakes_14-20" -geometry_fieldname = "geometry" -geometry_type = "multipolygon" -id_fieldname = "ogc_fid" -sql = "SELECT ST_AsMVTGeom(wkb_geometry,!BBOX!) AS geometry, name, ogc_fid FROM ne_10m_lakes WHERE wkb_geometry && !BBOX!" From ce2ebcea36f9411dd38a36a689d7ef2d7d021ca1 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Wed, 1 May 2024 09:05:42 -0500 Subject: [PATCH 25/31] Update cronjob resource for taginfo-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 253cef68..d0d33906 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -692,7 +692,7 @@ osm-seed: enabled: true schedule: "0 0 * * 0" # every 7 days nodeSelector: - enabled: false + enabled: true label_key: nodegroup_type label_value: job_xlarge # ==================================================================================================== From ac4f05129829dd101128d9683fec29eb3b971ff9 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Wed, 1 May 2024 19:26:44 -0500 Subject: [PATCH 26/31] Update osm-seed version --- ohm/requirements.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohm/requirements.yaml b/ohm/requirements.yaml index 62c1fcb4..e20b4e78 100644 --- a/ohm/requirements.yaml +++ b/ohm/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: osm-seed - version: '0.1.0-n779.h37cb8dc' + version: '0.1.0-n787.h2a19af9' repository: https://devseed.com/osm-seed-chart/ From 402e4c9008a953536fd822e99377356558e53bef Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 2 May 2024 08:52:01 -0500 Subject: [PATCH 27/31] Set read_only mode for website - 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 d0d33906..b099315f 100644 --- a/values.staging.template.yaml +++ b/values.staging.template.yaml @@ -120,7 +120,7 @@ osm-seed: NEW_RELIC_LICENSE_KEY: {{STAGING_NEW_RELIC_LICENSE_KEY}} NEW_RELIC_APP_NAME: {{STAGING_NEW_RELIC_APP_NAME}} ORGANIZATION_NAME: OpenHistoricalMap - WEBSITE_STATUS: "online" + WEBSITE_STATUS: "api_readonly" resources: enabled: false requests: From 053ffeac4b60e3765562f1000879827bc5f9de03 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 2 May 2024 09:24:20 -0500 Subject: [PATCH 28/31] Update settings.yml for key oauth - staging --- images/web/start.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/web/start.sh b/images/web/start.sh index 58d06a0b..09d29699 100755 --- a/images/web/start.sh +++ b/images/web/start.sh @@ -32,10 +32,13 @@ sed -i -e 's/smtp_port: 25/smtp_port: '$MAILER_PORT'/g' $workdir/config/settings #### SET UP ID KEY sed -i -e 's/id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings-local.yml +sed -i -e 's/#id_application: ""/id_application: "'$OPENSTREETMAP_id_key'"/g' $workdir/config/settings.yml ### SET UP OAUTH ID AND KEY sed -i -e 's/OAUTH_CLIENT_ID/'$OAUTH_CLIENT_ID'/g' $workdir/config/settings-local.yml sed -i -e 's/OAUTH_KEY/'$OAUTH_KEY'/g' $workdir/config/settings-local.yml +sed -i -e 's/# oauth_application: "OAUTH_CLIENT_ID"/oauth_application: "'$OAUTH_CLIENT_ID'"/g' $workdir/config/settings.yml +sed -i -e 's/# oauth_key: "OAUTH_CLIENT_ID"/oauth_key: "'$OAUTH_KEY'"/g' $workdir/config/settings.yml #### Setup env vars for memcached server sed -i -e 's/memcache_servers: \[\]/memcache_servers: "'$OPENSTREETMAP_memcache_servers'"/g' $workdir/config/settings-local.yml From c4aa185a86b638296f7a2b293921634cf9386076 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 2 May 2024 10:07:12 -0500 Subject: [PATCH 29/31] Set WEBSITE_STATUS in settings.yml --- images/web/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/web/start.sh b/images/web/start.sh index 09d29699..7a522a93 100755 --- a/images/web/start.sh +++ b/images/web/start.sh @@ -18,7 +18,7 @@ sed -i -e 's/server_url: "openhistoricalmap.example.com"/server_url: "'$SERVER_U sed -i -e 's/server_protocol: "http"/server_protocol: "'$SERVER_PROTOCOL'"/g' $workdir/config/settings-local.yml ### WEBSITE STATUS -sed -i "s/online/$WEBSITE_STATUS/g" $workdir/config/settings-local.yml +sed -i "s/online/$WEBSITE_STATUS/g" $workdir/config/settings.yml #### SETTING UP MAIL SENDER sed -i -e 's/smtp_address: "localhost"/smtp_address: "'$MAILER_ADDRESS'"/g' $workdir/config/settings-local.yml From eefcb0013db0eea5c9d413686e725a72fe5678bd Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 2 May 2024 10:29:56 -0500 Subject: [PATCH 30/31] Update setting-local website status --- images/web/config/settings-local.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/web/config/settings-local.yml b/images/web/config/settings-local.yml index 550ee763..3639f558 100644 --- a/images/web/config/settings-local.yml +++ b/images/web/config/settings-local.yml @@ -1,7 +1,6 @@ # The server protocol and host server_protocol: "http" server_url: "openhistoricalmap.example.com" -status: "online" # OAuth application for the web site oauth_application: "OAUTH_CLIENT_ID" oauth_key: "OAUTH_KEY" From daa10f404c009d7b2bffc553786b645ae4d563d3 Mon Sep 17 00:00:00 2001 From: Rub21 Date: Thu, 2 May 2024 12:08:41 -0500 Subject: [PATCH 31/31] Update EBS volume id for production api --- values.production.template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/values.production.template.yaml b/values.production.template.yaml index 693a3b48..760ef09b 100644 --- a/values.production.template.yaml +++ b/values.production.template.yaml @@ -69,8 +69,8 @@ osm-seed: mountPath: /var/lib/postgresql/data subPath: postgresql-db # In case cloudProvider: aws - AWS_ElasticBlockStore_volumeID : {{PRODUCTION_DB_EBS}} - AWS_ElasticBlockStore_size: 500Gi + AWS_ElasticBlockStore_volumeID : vol-08e31c1930e00a478 + AWS_ElasticBlockStore_size: 600Gi resources: enabled: false requests: