vikarti.anatra/nginx-ultimate-bad-bot-blocker
1
0
Fork 0
mirror of https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git synced 2025-09-04 03:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #78 from itoffshore/alpine

Browse source 
update-ngxblocker: fix dash incompatibility / use curl not wget
This commit is contained in:
Mitchell Krog 2017-08-24 11:51:03 +02:00 • committed by GitHub
commit d94821a183
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
update-ngxblocker
View file

@ -104,7 +104,7 @@ check_version() {
}
check_dirs() {
local x= dirs=$@
local x= dirs="$@"
for x in $dirs; do
if [ ! -d $x ]; then
@ -263,7 +263,7 @@ get_options() {
main() {
local REPO=https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master
local file=globalblacklist.conf remote_dir=conf.d url= output= update= status=
local file=globalblacklist.conf remote_dir=conf.d url= output= update= status= tmp=
# default to service (centos does not have 'which' by default)
local service=${service_cmd:-"service"}
@ -274,10 +274,10 @@ main() {
fi
check_depends
check_dirs $BOTS_DIR $CONF_DIR $SCRIPT_DIR
# parse command line
get_options $@
check_dirs $BOTS_DIR $CONF_DIR
url=$REPO/$remote_dir/$file
output=$CONF_DIR/$file
@ -288,8 +288,18 @@ main() {
if echo $update | grep ^Update 1>/dev/null; then
# download globalblacklist update
tmp=$(mktemp)
mkdir -p $CONF_DIR
wget $url $(wget_opts) -O $output 2>&1
printf "${BOLDWHITE}Downloading: $file "
curl --fail --connect-timeout 60 --retry 10 --retry-delay 5 -so $tmp $url
case "$?" in
0) printf "...${BOLDGREEN}OK${RESET}\n\n"
mv $tmp $output
;;
22) printf "...${BOLDRED}ERROR 404: $url${RESET}\n\n";;
28) printf "...${BOLDRED}ERROR TIMEOUT: $url${RESET}\n\n";;
esac
# download new bots.d / conf.d files
$INSTALL_INC