From d370d40df7d9fa4396558a7219bcfe8f793c5086 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman
Date: Tue, 7 Nov 2023 15:24:23 +0000
Subject: [PATCH] Reinstate statistics which is currently not used. Remove
unneeded line in Dockerfile.
---
setup/Dockerfile | 4 ----
setup/flavors/compose/mailu.env | 3 +++
setup/templates/steps/config.html | 7 +++++++
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/setup/Dockerfile b/setup/Dockerfile
index 6a57db18..a410871d 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -14,10 +14,6 @@ COPY main.py ./main.py
RUN echo $VERSION >> /version
-#Note: This is appended so we can explicitly check if this JS file has been loaded
-#by the user's internet browser when accessing the setup site.
-RUN echo var jQueryMailu=\'loaded\'\; >> ./static/jquery.min.js
-
EXPOSE 80/tcp
HEALTHCHECK --start-period=350s CMD curl -skfLo /dev/null http://localhost/
USER mailu
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 61bbc3c5..cffafe15 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -39,6 +39,9 @@ AUTH_RATELIMIT_IP={{ auth_ratelimit_ip }}/hour
AUTH_RATELIMIT_USER={{ auth_ratelimit_user }}/day
{% endif %}
+# Opt-out of statistics, replace with "True" to opt out
+DISABLE_STATISTICS={{ disable_statistics or 'False' }}
+
###################################
# Optional features
###################################
diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html
index d314c40b..c1a5ff43 100644
--- a/setup/templates/steps/config.html
+++ b/setup/templates/steps/config.html
@@ -58,6 +58,13 @@ Or in plain English: if receivers start to classify your mail as spam, this post