From 003402df401f2bbf46e47017e3b7a2ec27615ea2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 21 Jan 2021 14:20:13 -0600
Subject: Add ability to invalidate cache entries for Apache

---
 installation/apache-cache-purge.sh.example | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100755 installation/apache-cache-purge.sh.example

(limited to 'installation/apache-cache-purge.sh.example')

diff --git a/installation/apache-cache-purge.sh.example b/installation/apache-cache-purge.sh.example
new file mode 100755
index 000000000..be1d36841
--- /dev/null
+++ b/installation/apache-cache-purge.sh.example
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# A simple shell script to delete a media from Apache's mod_disk_cache.
+
+SCRIPTNAME=${0##*/}
+
+# mod_disk_cache directory
+CACHE_DIRECTORY="/tmp/pleroma-media-cache"
+
+## Removes an item via the htcacheclean utility
+## $1 - the filename, can be a pattern .
+## $2 - the cache directory.
+purge_item() {
+    htcacheclean -p "${2}" "${1}"
+} # purge_item
+
+purge() {
+  for url in "$@"
+  do
+    echo "$SCRIPTNAME delete \`$url\` from cache ($CACHE_DIRECTORY)"
+    purge_item "$url" $CACHE_DIRECTORY
+  done
+}
+
+purge "$@"
-- 
cgit v1.2.3


From 8373cb645b7f357eedbc3a45a2e75a81376e6ef8 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 25 Jan 2021 18:15:04 -0600
Subject: Add sudo rule, remove quoting that breaks the for loop

---
 installation/apache-cache-purge.sh.example | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'installation/apache-cache-purge.sh.example')

diff --git a/installation/apache-cache-purge.sh.example b/installation/apache-cache-purge.sh.example
index be1d36841..62997038d 100755
--- a/installation/apache-cache-purge.sh.example
+++ b/installation/apache-cache-purge.sh.example
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 # A simple shell script to delete a media from Apache's mod_disk_cache.
+# You will likely need to setup a sudo rule like the following:
+#
+# Cmnd_Alias HTCACHECLEAN = /usr/local/sbin/htcacheclean
+# pleroma ALL=HTCACHECLEAN, NOPASSWD: HTCACHECLEAN
 
 SCRIPTNAME=${0##*/}
 
@@ -11,15 +15,15 @@ CACHE_DIRECTORY="/tmp/pleroma-media-cache"
 ## $1 - the filename, can be a pattern .
 ## $2 - the cache directory.
 purge_item() {
-    htcacheclean -p "${2}" "${1}"
+    sudo htcacheclean -v -p "${2}" "${1}"
 } # purge_item
 
 purge() {
-  for url in "$@"
+  for url in $@
   do
     echo "$SCRIPTNAME delete \`$url\` from cache ($CACHE_DIRECTORY)"
     purge_item "$url" $CACHE_DIRECTORY
   done
 }
 
-purge "$@"
+purge $@
-- 
cgit v1.2.3


From c6ef87d585b63e9e26b16176b65a67d10e4b706b Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Mon, 25 Jan 2021 18:20:07 -0600
Subject: Note the requirement for the url_format parameter

---
 installation/apache-cache-purge.sh.example | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'installation/apache-cache-purge.sh.example')

diff --git a/installation/apache-cache-purge.sh.example b/installation/apache-cache-purge.sh.example
index 62997038d..7b4262875 100755
--- a/installation/apache-cache-purge.sh.example
+++ b/installation/apache-cache-purge.sh.example
@@ -5,6 +5,13 @@
 #
 # Cmnd_Alias HTCACHECLEAN = /usr/local/sbin/htcacheclean
 # pleroma ALL=HTCACHECLEAN, NOPASSWD: HTCACHECLEAN
+#
+# Please also ensure you have enabled:
+#
+# config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, url_format: :htcacheclean
+#
+# which will correctly format the URLs passed to this script for the htcacheclean utility.
+#
 
 SCRIPTNAME=${0##*/}
 
-- 
cgit v1.2.3