diff --git a/hetzner/config/postgresql.config b/hetzner/config/postgresql.config index e7d02f99..7f0636dc 100644 --- a/hetzner/config/postgresql.config +++ b/hetzner/config/postgresql.config @@ -3,7 +3,7 @@ #------------------------------------------------------------------------------ listen_addresses = '*' # Allow connections from all addresses -max_connections = 100 # Set max connections to 120 +max_connections = 200 # Set max connections to 120 superuser_reserved_connections = 3 # Reserve for superusers #------------------------------------------------------------------------------ @@ -13,7 +13,7 @@ superuser_reserved_connections = 3 # Reserve for superusers # - Memory Configuration - shared_buffers = 14GB # Allocate 25% of total memory -work_mem = 512MB # Increase per-query memory for sorting, hashing +work_mem = 256MB # Increase per-query memory for sorting, hashing maintenance_work_mem = 2GB # For maintenance operations like VACUUM, ALTER effective_cache_size = 41GB # 75% of total memory for caching @@ -50,7 +50,7 @@ parallel_tuple_cost = 0.1 # Lower to encourage parallelism parallel_setup_cost = 500 # Lower setup cost for parallel processing max_worker_processes = 28 # Utilize CPU cores efficiently max_parallel_workers_per_gather = 8 # Allow parallel processing for queries -max_parallel_workers = 14 # Limit the total parallel workers +max_parallel_workers = 28 # Limit the total parallel workers #------------------------------------------------------------------------------ # LOGGING @@ -64,7 +64,7 @@ log_truncate_on_rotation = on # Overwrite old logs with the same nam log_min_duration_statement = 20000 # Log queries that take longer than 20 seconds (in milliseconds) -log_statement = 'none' # Disable logging of all statements +log_statement = 'ddl' # Disable logging of all statements log_duration = off # Disable duration logging for all queries @@ -72,9 +72,9 @@ log_duration = off # Disable duration logging for all qu # CLIENT CONNECTION DEFAULTS #------------------------------------------------------------------------------ -statement_timeout = 60000 # Terminate queries running longer than 60 seconds (in milliseconds) -lock_timeout = 60000 # Timeout for acquiring locks (in milliseconds) -idle_in_transaction_session_timeout = 60000 # Close idle transactions after 60 seconds (in milliseconds) +statement_timeout = 600000 # Terminate queries running longer than 10 min (in milliseconds) +lock_timeout = 600000 # Timeout for acquiring locks (in milliseconds) +idle_in_transaction_session_timeout = 600000 # Close idle transactions after 10 min (in milliseconds) #------------------------------------------------------------------------------ diff --git a/images/web/Dockerfile b/images/web/Dockerfile index 065de1e1..be53b59a 100644 --- a/images/web/Dockerfile +++ b/images/web/Dockerfile @@ -133,7 +133,7 @@ RUN apache2ctl configtest RUN chown -R www-data: $workdir # Clone Map-styles -ENV OPENHISTORICALMAP_MAP_STYLES_GITSHA=6de6e329569ab6561d1fa6ab2cebb42df7fd17c7 +ENV OPENHISTORICALMAP_MAP_STYLES_GITSHA=34b84bbbd1307698ee1d30a32dc96222b8992de4 RUN git clone --branch staging --depth 1 https://github.com/OpenHistoricalMap/map-styles.git $workdir/public/map-styles RUN cd $workdir/public/map-styles && git fetch --depth 1 origin $OPENHISTORICALMAP_MAP_STYLES_GITSHA && git checkout $OPENHISTORICALMAP_MAP_STYLES_GITSHA RUN rm -rf $workdir/public/map-styles/.git