You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
1.1 KiB
26 lines
1.1 KiB
5 years ago
|
From ec37b1942c4da76f7a0f71efe81bea6835466648 Mon Sep 17 00:00:00 2001
|
||
|
|
From: sebres <serg.brester@sebres.de>
|
||
|
|
Date: Tue, 14 Jan 2020 11:39:13 +0100
|
||
|
|
Subject: [PATCH] action.d/nginx-block-map.conf: fixed backslash substitution
|
||
|
|
(different echo behavior in some shells, gh-2596)
|
||
|
|
|
||
|
|
---
|
||
|
|
config/action.d/nginx-block-map.conf | 6 ++++--
|
||
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/config/action.d/nginx-block-map.conf b/config/action.d/nginx-block-map.conf
|
||
|
|
index 0b6aa0ad7..ee702907e 100644
|
||
|
|
--- a/config/action.d/nginx-block-map.conf
|
||
|
|
+++ b/config/action.d/nginx-block-map.conf
|
||
|
|
@@ -103,6 +103,8 @@ actionstop = %(actionflush)s
|
||
|
|
|
||
|
|
actioncheck =
|
||
|
|
|
||
|
|
-actionban = echo "\\\\<fid> 1;" >> '%(blck_lst_file)s'; %(blck_lst_reload)s
|
||
|
|
+_echo_blck_row = printf '\%%s 1;\n' "<fid>"
|
||
|
|
|
||
|
|
-actionunban = id=$(echo "<fid>" | sed -e 's/[]\/$*.^|[]/\\&/g'); sed -i "/^\\\\$id 1;$/d" %(blck_lst_file)s; %(blck_lst_reload)s
|
||
|
|
+actionban = %(_echo_blck_row)s >> '%(blck_lst_file)s'; %(blck_lst_reload)s
|
||
|
|
+
|
||
|
|
+actionunban = id=$(%(_echo_blck_row)s | sed -e 's/[]\/$*.^|[]/\\&/g'); sed -i "/^$id$/d" %(blck_lst_file)s; %(blck_lst_reload)s
|