From e4cd7e9157ed9dccda1736e209b8aca02ac2277f Mon Sep 17 00:00:00 2001
From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com>
Date: Tue, 7 May 2024 15:41:35 +0300
Subject: [PATCH 1/2] Scale the uwsgi container, remove deprecated version in
 docker-compose.yml

---
 dockerize/Makefile           | 2 +-
 dockerize/docker-compose.yml | 2 --
 dockerize/docker/uwsgi.conf  | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dockerize/Makefile b/dockerize/Makefile
index 417a360b..43039c82 100644
--- a/dockerize/Makefile
+++ b/dockerize/Makefile
@@ -41,7 +41,7 @@ web: db
 	@echo "------------------------------------------------------------------"
 	@echo "Running in production mode"
 	@echo "------------------------------------------------------------------"
-	@docker compose -p $(PROJECT_ID) up -d uwsgi web worker beat
+	@docker compose -p $(PROJECT_ID) up -d --scale uwsgi=2 web worker beat
 
 dbbackups: db
 	@echo
diff --git a/dockerize/docker-compose.yml b/dockerize/docker-compose.yml
index 0d1b297c..5101acc5 100644
--- a/dockerize/docker-compose.yml
+++ b/dockerize/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 volumes:
   postgres_data:
   rabbitmq:
@@ -26,7 +25,6 @@ services:
     restart: unless-stopped
 
   uwsgi: &uwsgi-common
-    container_name: qgis-plugins-uwsgi-common
     build:
       context: ${PWD}/../
       dockerfile: dockerize/docker/Dockerfile
diff --git a/dockerize/docker/uwsgi.conf b/dockerize/docker/uwsgi.conf
index 021b902a..c27283a1 100644
--- a/dockerize/docker/uwsgi.conf
+++ b/dockerize/docker/uwsgi.conf
@@ -18,5 +18,5 @@ logger = file:/var/log/uwsgi-errors.log
 #uid = 1000
 #gid = 1000
 memory-report = true
-harakiri = 2000
+harakiri = 50
 listen = 127

From 8ce54e41b26903ebbcbfc72621e45930aafc6e80 Mon Sep 17 00:00:00 2001
From: Lova ANDRIARIMALALA <43842786+Xpirix@users.noreply.github.com>
Date: Tue, 7 May 2024 22:06:09 +0300
Subject: [PATCH 2/2] Add ENABLE_LDAP to the environment variable

---
 dockerize/.env.template      | 5 ++++-
 dockerize/docker-compose.yml | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dockerize/.env.template b/dockerize/.env.template
index 23981fe9..43f8d6bb 100644
--- a/dockerize/.env.template
+++ b/dockerize/.env.template
@@ -28,4 +28,7 @@ EMAIL_HOST_PASSWORD=''
 DEFAULT_PLUGINS_SITE='https://plugins.qgis.org/'
 
 # ENV: debug or prod
-QGISPLUGINS_ENV=debug
\ No newline at end of file
+QGISPLUGINS_ENV=debug
+
+# Ldap
+ENABLE_LDAP=True
\ No newline at end of file
diff --git a/dockerize/docker-compose.yml b/dockerize/docker-compose.yml
index 5101acc5..3b7c89db 100644
--- a/dockerize/docker-compose.yml
+++ b/dockerize/docker-compose.yml
@@ -41,6 +41,7 @@ services:
       - VIRTUAL_HOST=${VIRTUAL_HOST:-plugins.kartoza.com}
       - VIRTUAL_PORT=${VIRTUAL_PORT:-8080}
       - DEBUG=${DEBUG:-False}
+      - ENABLE_LDAP=${ENABLE_LDAP:-False}
       - RABBITMQ_HOST=${RABBITMQ_HOST:-rabbitmq}
       - BROKER_URL=amqp://rabbitmq:5672
       - EMAIL_BACKEND=${EMAIL_BACKEND}