From 3788b6f5e75a1077f662edd660650877e9cd52e6 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Fri, 14 Jul 2023 14:53:00 +0200
Subject: [PATCH] Add support for APPLICATION_ROOT in Docker container

---
 Dockerfile                                  | 1 +
 conf/entrypoint.sh                          | 1 +
 docker-compose.yml                          | 1 +
 ihatemoney/conf-templates/ihatemoney.cfg.j2 | 7 +++++--
 ihatemoney/default_settings.py              | 7 ++++---
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0258d751..3a54cf47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,7 @@ ENV DEBUG="False" \
     SHOW_ADMIN_EMAIL="True" \
     SQLALCHEMY_DATABASE_URI="sqlite:////database/ihatemoney.db" \
     SQLALCHEMY_TRACK_MODIFICATIONS="False" \
+    APPLICATION_ROOT="/" \
     ENABLE_CAPTCHA="False" \
     LEGAL_LINK=""
 
diff --git a/conf/entrypoint.sh b/conf/entrypoint.sh
index 81fcd720..b263a471 100755
--- a/conf/entrypoint.sh
+++ b/conf/entrypoint.sh
@@ -23,6 +23,7 @@ SHOW_ADMIN_EMAIL = $SHOW_ADMIN_EMAIL
 SQLACHEMY_DEBUG = DEBUG
 SQLALCHEMY_DATABASE_URI = "$SQLALCHEMY_DATABASE_URI"
 SQLALCHEMY_TRACK_MODIFICATIONS = $SQLALCHEMY_TRACK_MODIFICATIONS
+APPLICATION_ROOT = "$APPLICATION_ROOT"
 ENABLE_CAPTCHA = $ENABLE_CAPTCHA
 LEGAL_LINK = "$LEGAL_LINK"
 EOF
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b22b1a3..df893beb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,6 +35,7 @@ services:
       - SHOW_ADMIN_EMAIL=True
       - SQLALCHEMY_DATABASE_URI=sqlite:////database/ihatemoney.db
       - SQLALCHEMY_TRACK_MODIFICATIONS=False
+      - APPLICATION_ROOT=/
       - ENABLE_CAPTCHA=False
       - LEGAL_LINK=
       - PORT=8000
diff --git a/ihatemoney/conf-templates/ihatemoney.cfg.j2 b/ihatemoney/conf-templates/ihatemoney.cfg.j2
index e476aca2..ba4793da 100644
--- a/ihatemoney/conf-templates/ihatemoney.cfg.j2
+++ b/ihatemoney/conf-templates/ihatemoney.cfg.j2
@@ -47,11 +47,14 @@ ACTIVATE_ADMIN_DASHBOARD = False
 # service over plain HTTP.
 SESSION_COOKIE_SECURE = True
 
+# Set this to a URL path under which the application will be served.  Defaults to "/"
+APPLICATION_ROOT = "/"
+
 # You can activate an optional CAPTCHA if you want to. It can be helpful
 # to filter spammer bots.
-# ENABLE_CAPTCHA = True
+ENABLE_CAPTCHA = False
 
 # You may want to point to a special legal page, for instance to give information
 # about GDPR, or how you handle the data of your users.
 # Set this variable to the URL you want.
-# LEGAL_LINK = ""
+LEGAL_LINK = ""
diff --git a/ihatemoney/default_settings.py b/ihatemoney/default_settings.py
index fbde84d4..48112afb 100644
--- a/ihatemoney/default_settings.py
+++ b/ihatemoney/default_settings.py
@@ -6,10 +6,13 @@ SECRET_KEY = "tralala"
 MAIL_DEFAULT_SENDER = "Budget manager <admin@example.com>"
 SHOW_ADMIN_EMAIL = True
 ACTIVATE_DEMO_PROJECT = True
+ACTIVATE_ADMIN_DASHBOARD = False
 ADMIN_PASSWORD = ""
 ALLOW_PUBLIC_PROJECT_CREATION = True
-ACTIVATE_ADMIN_DASHBOARD = False
 SESSION_COOKIE_SECURE = True
+APPLICATION_ROOT = "/"
+ENABLE_CAPTCHA = False
+LEGAL_LINK = ""
 SUPPORTED_LANGUAGES = [
     "ca",
     "cs",
@@ -43,5 +46,3 @@ SUPPORTED_LANGUAGES = [
     "uk",
     "zh_Hans",
 ]
-ENABLE_CAPTCHA = False
-LEGAL_LINK = ""