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-05 20:20:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Add option to suppress scripts-update (only update rules/config)."

Browse source 
This reverts commit ea4ad3aeab.
This commit is contained in:
Stuart Cardall 2020-02-11 09:17:08 +00:00
parent 9380ffd75f
commit f1a53c05a5
No known key found for this signature in database
GPG key ID: AEB857F1C891D0C6
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
install-ngxblocker
View file

@ -36,7 +36,6 @@ CONF_DIR=/etc/nginx/conf.d
BOTS_DIR=/etc/nginx/bots.d BOTS_DIR=/etc/nginx/bots.d
SCRIPT_DIR=/usr/local/sbin SCRIPT_DIR=/usr/local/sbin
REPO=https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master REPO=https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master
SUPPRESS_SCRIPTS=false
####### end user configuration ########################## ####### end user configuration ##########################
@ -49,7 +48,6 @@ Usage: $script [OPTIONS]
[ -b ] : Bot rules directory (default: $BOTS_DIR) [ -b ] : Bot rules directory (default: $BOTS_DIR)
[ -c ] : NGINX conf directory (default: $CONF_DIR) [ -c ] : NGINX conf directory (default: $CONF_DIR)
[ -s ] : Script directory (default: $SCRIPT_DIR) [ -s ] : Script directory (default: $SCRIPT_DIR)
[ -S ] : Suppress script download (default: $SUPPRESS_SCRIPTS)
[ -r ] : Change repo url (default: $REPO) [ -r ] : Change repo url (default: $REPO)
[ -x ] : Actually change the files (default: don't change anything) [ -x ] : Actually change the files (default: don't change anything)
[ -q ] : Suppress non error messages [ -q ] : Suppress non error messages
@ -208,7 +206,7 @@ print_message() {
get_options() { get_options() {
local arg= opts= local arg= opts=
while getopts :b:c:s:Sr:xvqh opts "$@" while getopts :b:c:s:r:xvqh opts "$@"
do do
if [ -n "${OPTARG}" ]; then if [ -n "${OPTARG}" ]; then
case "$opts" in case "$opts" in
@ -221,7 +219,6 @@ get_options() {
b) BOTS_DIR=$arg; check_args $opts path $arg ;; b) BOTS_DIR=$arg; check_args $opts path $arg ;;
c) CONF_DIR=$arg; check_args $opts path $arg ;; c) CONF_DIR=$arg; check_args $opts path $arg ;;
s) SCRIPT_DIR=$arg; check_args $opts path $arg ;; s) SCRIPT_DIR=$arg; check_args $opts path $arg ;;
S) SUPPRESS_SCRIPTS=true
r) REPO=$arg; check_args $opts url $arg ;; r) REPO=$arg; check_args $opts url $arg ;;
x) DRY_RUN=N ;; x) DRY_RUN=N ;;
v) check_version ;; v) check_version ;;
@ -331,14 +328,12 @@ main() {
check_config $CONF_DIR $BOTS_DIR $SCRIPT_DIR check_config $CONF_DIR $BOTS_DIR $SCRIPT_DIR
download_files conf.d $CONF_DIR $CONF_FILES download_files conf.d $CONF_DIR $CONF_FILES
download_files bots.d $BOTS_DIR $BOT_FILES download_files bots.d $BOTS_DIR $BOT_FILES
if [ $SUPPRESS_SCRIPTS = false ]; then
download_files / $SCRIPT_DIR $SCRIPT_FILES download_files / $SCRIPT_DIR $SCRIPT_FILES
# ensures scripts are executable # ensures scripts are executable
if [ "$DRY_RUN" = "N" ]; then if [ "$DRY_RUN" = "N" ]; then
set_mode 700 $SCRIPT_DIR $SCRIPT_FILES set_mode 700 $SCRIPT_DIR $SCRIPT_FILES
fi fi
fi
} }
## START ## ## START ##