From 54134b490ccf208ddf72395df3a85c45066792cb Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sat, 28 Oct 2023 10:00:37 +0100
Subject: [PATCH] Merge Vary headers on cached responses

The cache/.htaccess mechanism should actually be moved into
the apache2 config, instead of the current hackish solution...
---
 docker/conf/apache2/sites-available/noblogs.org.conf | 2 +-
 docker/conf/cont-init.d/50cache-htaccess             | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker/conf/apache2/sites-available/noblogs.org.conf b/docker/conf/apache2/sites-available/noblogs.org.conf
index e533ff1f..2395ab56 100644
--- a/docker/conf/apache2/sites-available/noblogs.org.conf
+++ b/docker/conf/apache2/sites-available/noblogs.org.conf
@@ -25,7 +25,7 @@
 
 	# Support ActivityPub content negotiation on user profiles.
 	<Location /post/author/>
-		Header append Vary "Accept"
+		Header merge Vary "Accept"
 	</Location>
 
 </VirtualHost>
diff --git a/docker/conf/cont-init.d/50cache-htaccess b/docker/conf/cont-init.d/50cache-htaccess
index 14c69ee4..a433432f 100755
--- a/docker/conf/cont-init.d/50cache-htaccess
+++ b/docker/conf/cont-init.d/50cache-htaccess
@@ -2,15 +2,13 @@
 
 cache_dir=/opt/noblogs/www/wp-content/cache
 
-if [ ! -e "$cache_dir/.htaccess" ]; then
-    mkdir -p $cache_dir
-    cat >"$cache_dir/.htaccess" <<EOF
+mkdir -p $cache_dir
+cat >"$cache_dir/.htaccess" <<EOF
 Options -Indexes
-Header set Vary "Accept-Encoding, Cookie"
+Header merge Vary "Accept-Encoding,Cookie"
 Header set Cache-Control "max-age=60"
 ExpiresActive On
 ExpiresByType text/html A60
 EOF
-fi
 
 exit 0
-- 
GitLab