From 8401b08357046f1c58ea0069e5deb4053a45bade Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Tue, 13 May 2025 14:59:19 -0700
Subject: [PATCH] apache: Allow customization to the root of a site

Tests:

- After a domain is added and a TLS configuration for the site is created,
creating each of the 4 files leads to customization for that domain. In case of
last two files, only the domain is effected.
  - /etc/apache2/includes/all-domains-include-freedombox.conf
  - /etc/apache2/includes/all-domains-include.conf
  - /etc/apache2/includes/$domain-include-freedombox.conf
  - /etc/apache2/includes/$domain-include.conf

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../conf-available/freedombox-tls-site-macro.conf   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
index 0eecd13ed..a2ebf2342 100644
--- a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
+++ b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf
@@ -25,6 +25,19 @@
             <Directory /usr/lib/cgi-bin>
                 SSLOptions +StdEnvVars
             </Directory>
+
+            <IfFile /etc/apache2/includes/all-domains-include-freedombox.conf>
+                Include includes/all-domains-include-freedombox.conf
+            </IfFile>
+            <IfFile /etc/apache2/includes/all-domains-include.conf>
+                Include includes/all-domains-include.conf
+            </IfFile>
+            <IfFile /etc/apache2/includes/$domain-include-freedombox.conf>
+                Include includes/$domain-include-freedombox.conf
+            </IfFile>
+            <IfFile /etc/apache2/includes/$domain-include.conf>
+                Include includes/$domain-include.conf
+            </IfFile>
         </VirtualHost>
     </IfModule>
 </Macro>