From 355cc84a1bed7829119fe2efe7d9fa8af0a03968 Mon Sep 17 00:00:00 2001
From: fliu <10025-fliu@users.noreply.salsa.debian.org>
Date: Thu, 29 Jul 2021 20:55:55 +0000
Subject: [PATCH] email: apache: X-Robots-Tag header, full URL match

---
 .../apache2/conf-available/email-server-freedombox.conf  | 9 ++++++---
 .../data/etc/apache2/includes/freedombox-robots.conf     | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 plinth/modules/email_server/data/etc/apache2/includes/freedombox-robots.conf

diff --git a/plinth/modules/email_server/data/etc/apache2/conf-available/email-server-freedombox.conf b/plinth/modules/email_server/data/etc/apache2/conf-available/email-server-freedombox.conf
index f674fc07c..82034aeda 100644
--- a/plinth/modules/email_server/data/etc/apache2/conf-available/email-server-freedombox.conf
+++ b/plinth/modules/email_server/data/etc/apache2/conf-available/email-server-freedombox.conf
@@ -1,8 +1,9 @@
-<Location ~ "/rspamd$">
+<LocationMatch "^/rspamd$">
     Redirect "/rspamd/"
-</Location>
+    Include includes/freedombox-robots.conf
+</LocationMatch>
 
-<Location ~ "/rspamd/">
+<Location "/rspamd/">
     ProxyPass http://127.0.0.1:11334/
     ProxyPassReverse http://127.0.0.1:11334/
     # Modify proxy headers
@@ -15,6 +16,8 @@
     RequestHeader unset X-Forwarded-Server
     RequestHeader unset X-Real-IP
     RequestHeader set X-Forwarded-For "127.0.0.1"
+    # Modify response headers
+    Header unset Set-Cookie
     # Require SSO
     Include includes/freedombox-single-sign-on.conf
     <IfModule mod_auth_pubtkt.c>
diff --git a/plinth/modules/email_server/data/etc/apache2/includes/freedombox-robots.conf b/plinth/modules/email_server/data/etc/apache2/includes/freedombox-robots.conf
new file mode 100644
index 000000000..87ef3035d
--- /dev/null
+++ b/plinth/modules/email_server/data/etc/apache2/includes/freedombox-robots.conf
@@ -0,0 +1 @@
+Header merge X-Robots-Tag "noindex, nofollow, noarchive, notranslate"