From ab7537142a94b972f70fc4a06d397c49fd4412a9 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Fri, 15 Aug 2025 16:04:31 +0200 Subject: [PATCH 1/3] Cleanup of non necessary entrypoints - increase heaer size for gunicorn --- deployment/community/.env.template | 2 ++ deployment/community/docker-compose.yml | 4 ---- deployment/enterprise/.env.template | 2 ++ deployment/enterprise/docker-compose.yml | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/deployment/community/.env.template b/deployment/community/.env.template index 4526246e..01a3011c 100644 --- a/deployment/community/.env.template +++ b/deployment/community/.env.template @@ -215,5 +215,7 @@ NO_MONKEY_PATCH=False # Diagnostic logs +DIAGNOSTIC_LOGS_URL= + DIAGNOSTIC_LOGS_DIR=/diagnostic_logs diff --git a/deployment/community/docker-compose.yml b/deployment/community/docker-compose.yml index 8b5d5156..3a5b2665 100644 --- a/deployment/community/docker-compose.yml +++ b/deployment/community/docker-compose.yml @@ -30,7 +30,6 @@ services: volumes: - ./projects:/data - ./diagnostic_logs:/diagnostic_logs - - ../common/entrypoint.sh:/app/entrypoint.sh env_file: - .prod.env depends_on: @@ -48,8 +47,6 @@ services: environment: - GEVENT_WORKER=0 - NO_MONKEY_PATCH=1 - volumes: - - ../common/entrypoint.sh:/app/entrypoint.sh depends_on: - redis - server @@ -68,7 +65,6 @@ services: - NO_MONKEY_PATCH=1 volumes: - ./projects:/data - - ../common/entrypoint.sh:/app/entrypoint.sh depends_on: - redis - server diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index f51c8bef..2d63cd32 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -228,6 +228,8 @@ VECTOR_TILES_STYLE_URL=https://tiles-ee.merginmaps.com//styles/default.json ### Diagnostic logs from Mobile and QGIS Plugin DIAGNOSTIC_LOGS_DIR=/diagnostic_logs +DIAGNOSTIC_LOGS_URL= + ### SSO ################################################################################################################ SSO_ENABLED=False diff --git a/deployment/enterprise/docker-compose.yml b/deployment/enterprise/docker-compose.yml index c4524707..902a66ef 100644 --- a/deployment/enterprise/docker-compose.yml +++ b/deployment/enterprise/docker-compose.yml @@ -13,9 +13,10 @@ services: volumes: - ./data:/data # map data dir to host - ./diagnostic_logs:/diagnostic_logs # diagnostic logs dir - - ../common/entrypoint.sh:/app/entrypoint.sh env_file: - .prod.env + environment: + - GUNICORN_CMD_ARGS="--limit-request-line 8190" depends_on: - db networks: @@ -56,8 +57,6 @@ services: restart: always user: 901:999 command: ["celery -A application.celery beat --loglevel=info"] - volumes: - - ../common/entrypoint.sh:/app/entrypoint.sh env_file: - .prod.env depends_on: @@ -75,7 +74,6 @@ services: volumes: - ./data:/data # map data dir to host - ./map_data:/overviews - - ../common/entrypoint.sh:/app/entrypoint.sh env_file: - .prod.env depends_on: From 61fa9b7379766d354180125fddef55b686c20f10 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Tue, 19 Aug 2025 17:26:49 +0200 Subject: [PATCH 2/3] Cleanup duplicated MERGIN_BASE_URL --- deployment/enterprise/.env.template | 3 --- 1 file changed, 3 deletions(-) diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index 2d63cd32..4d240256 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -175,9 +175,6 @@ ACCOUNT_EXPIRATION=1 # for links generated in emails -#MERGIN_BASE_URL=http://localhost:5000 -MERGIN_BASE_URL=fixme - #MERGIN_LOGO_URL= # for link to logo in emails MERGIN_LOGO_URL=fixme From cacb71b44ccc96e978cdeb602b4493e599ff8009 Mon Sep 17 00:00:00 2001 From: "marcel.kocisek" Date: Mon, 1 Sep 2025 12:02:41 +0200 Subject: [PATCH 3/3] Fix MERGIN_LOGO_URL in emails to mm default --- deployment/community/.env.template | 4 +--- deployment/enterprise/.env.template | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/deployment/community/.env.template b/deployment/community/.env.template index 01a3011c..86e4a6b0 100644 --- a/deployment/community/.env.template +++ b/deployment/community/.env.template @@ -98,12 +98,10 @@ MAIL_SUPPRESS_SEND=0 #MAIL_BCC='' -#MERGIN_LOGO_URL= # for link to logo in emails +MERGIN_LOGO_URL=https://merginmaps.com/MM_logo_HORIZ_COLOR_TRANSPARENT_no_padding.png #MAIL_DEBUG=MAIL_SUPPRESS_SEND | False - - # data sync #LOCAL_PROJECTS=os.path.join(config_dir, os.pardir, os.pardir, 'projects') # for local storage type diff --git a/deployment/enterprise/.env.template b/deployment/enterprise/.env.template index 4d240256..663ba5ac 100644 --- a/deployment/enterprise/.env.template +++ b/deployment/enterprise/.env.template @@ -176,7 +176,7 @@ ACCOUNT_EXPIRATION=1 # for links generated in emails #MERGIN_LOGO_URL= # for link to logo in emails -MERGIN_LOGO_URL=fixme +MERGIN_LOGO_URL=https://merginmaps.com/MM_logo_HORIZ_COLOR_TRANSPARENT_no_padding.png # global workspace related bits - ignored in non-CE versions # GLOBAL_WORKSPACE mergin