bug fixes

sdr-enthusiasts · Feb 13, 2024 · 93fa43f · 93fa43f
1 parent 8ca8628
commit 93fa43f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rootfs/etc/s6-overlay/scripts/10-ssl b/rootfs/etc/s6-overlay/scripts/10-ssl
@@ -28,7 +28,7 @@ then
   (( mustforce - lastforced > 0 )) && forceinstall="true" || true
   date +%s > /run/nginx/.letsencrypt/.force-reinstall.lastforced
   "${s6wrap[@]}" echo "Checking if SSL certificates must be reinstalled: Must reinstall if last install was before $(date -d "@$mustforce"). Last reinstall was at $(date -d "@$lastforced"). Will "
-  [[ "$forceinstall" == "true" ]] && echo "reinstall certificates." || echo "not reinstall certificates."
+  [[ "$forceinstall" == "true" ]] && "${s6wrap[@]}" echo "reinstall certificates." || "${s6wrap[@]}" echo "not reinstall certificates."
 fi
 
 # if there is a backup and $forceinstall is not true, restore it

diff --git a/rootfs/etc/s6-overlay/scripts/30-blockbot b/rootfs/etc/s6-overlay/scripts/30-blockbot
@@ -11,9 +11,9 @@ mv -f /root/ipmap /usr/local/bin >/dev/null 2>&1
 if [[ -n "$BLOCKBOT" ]]
 then
   # shellcheck disable=SC2001
-  { BLOCKLIST="$(sed 's/,/|/g' <<< "$BLOCKBOT")"
-    "${s6wrap[@]}" echo "Blocking these bots: $BLOCKBOT"
-    printf "map \$http_user_agent \$limit_bots {\n"
+  BLOCKLIST="$(sed 's/,/|/g' <<< "$BLOCKBOT")"
+  "${s6wrap[@]}" echo "Blocking these bots: $BLOCKBOT"
+  { printf "map \$http_user_agent \$limit_bots {\n"
     printf "       default 0;\n"
     printf "       ~*(%s) 1;\n" "${BLOCKLIST// /}"
     printf "}\n"