diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-02 16:36:54 +0300 |
commit | 61180ab6f4b85ab78de2eaf1bc1b974c9e7908af (patch) | |
tree | 0970691b2060e06b6feaf4e645021298a7efda0d /installation/nginx-cache-purge.sh.example | |
parent | 0e23138b50f1fdd9ea78df31eec1b3caac905e2c (diff) | |
parent | 4c044f62258b33a95b8281e1eb42a5e0ce47d42d (diff) | |
download | pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.tar.gz pleroma-61180ab6f4b85ab78de2eaf1bc1b974c9e7908af.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
Diffstat (limited to 'installation/nginx-cache-purge.sh.example')
-rwxr-xr-x | installation/nginx-cache-purge.sh.example | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/installation/nginx-cache-purge.sh.example b/installation/nginx-cache-purge.sh.example index b2915321c..5f6cbb128 100755 --- a/installation/nginx-cache-purge.sh.example +++ b/installation/nginx-cache-purge.sh.example @@ -13,7 +13,7 @@ CACHE_DIRECTORY="/tmp/pleroma-media-cache" ## $3 - (optional) the number of parallel processes to run for grep. get_cache_files() { local max_parallel=${3-16} - find $2 -maxdepth 2 -type d | xargs -P $max_parallel -n 1 grep -E Rl "^KEY:.*$1" | sort -u + find $2 -maxdepth 2 -type d | xargs -P $max_parallel -n 1 grep -E -Rl "^KEY:.*$1" | sort -u } ## Removes an item from the given cache zone. @@ -37,4 +37,4 @@ purge() { } -purge $1 +purge $@ |