From b261444ebb0aebed7948c2e837b83781f57485c5 Mon Sep 17 00:00:00 2001 From: Mitchell Krog UB1 Date: Sun, 16 Apr 2017 10:54:30 +0200 Subject: [PATCH] Change install, setup and update script names for Consistency --- installnginxblocker.sh | 36 ------------------ updatenginxblocker.sh | 84 ------------------------------------------ 2 files changed, 120 deletions(-) delete mode 100755 installnginxblocker.sh delete mode 100755 updatenginxblocker.sh diff --git a/installnginxblocker.sh b/installnginxblocker.sh deleted file mode 100755 index 5b623b67d..000000000 --- a/installnginxblocker.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# Bash Script for Installing the Nginx Bad Bot Blocker -# Copyright - https://github.com/mitchellkrogza -# Project Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker - -# PLEASE READ CONFIGURATION INSTRUCTIONS BEFORE USING THIS - THIS IS ONLY A PARTIAL INSTALLER -# FOR COPYING THE FILES CORRECTLY TO NGINX INTO THE CORRECT FOLDERS -# https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/blob/master/CONFIGURATION.md - -# Use this script only once and thereafter use the Auto Update Bash Script updatenginxblocker.sh - -# THIS INSTALL SCRIPT **ONLY** COPIES THE NECESSARY FILES FOR NGINX DIRECT FROM THE REPO -### The installer script does not carry out STEP 6 of the configuration instructions for you. -### You must manually edit any vhost files with the includes in STEP 6 or it will not actually be protecting any sites. -### READ: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/blob/master/CONFIGURATION.md - -# Save this file as /bin/installnginxblocker.sh -# Make it Executable chmod +x /bin/installnginxblocker.sh -# Run it from the command line using sudo /bin/installnginxblocker.sh - -# LETS INSTALL NOW - -cd /etc/nginx/conf.d -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/conf.d/globalblacklist.conf -O globalblacklist.conf -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/conf.d/botblocker-nginx-settings.conf -O botblocker-nginx-settings.conf -sudo mkdir /etc/nginx/bots.d -cd /etc/nginx/bots.d -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/bots.d/blockbots.conf -O blockbots.conf -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/bots.d/ddos.conf -O ddos.conf -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/bots.d/whitelist-ips.conf -O whitelist-ips.conf -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/bots.d/whitelist-domains.conf -O whitelist-domains.conf -sudo wget https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/bots.d/blacklist-user-agents.conf -O blacklist-user-agents.conf -exit 0 - -# PLEASE READ CONFIGURATION INSTRUCTIONS -# https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/blob/master/CONFIGURATION.md \ No newline at end of file diff --git a/updatenginxblocker.sh b/updatenginxblocker.sh deleted file mode 100755 index b02e3e752..000000000 --- a/updatenginxblocker.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/sh - -# Shell Script for Auto Updating the Nginx Bad Bot Blocker -# Copyright: https://github.com/mitchellkrogza -# Project Url: https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker -# Update script & Alpine Linux package by Stuart Cardall: https://github.com/itoffshore - -# MAKE SURE you have your whitelist-ips.conf, whitelist-domains.conf and blacklist-user-agents.conf files in /etc/nginx/bots.d -# A major change to using include files was introduced in -# https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/commit/c7acdfa8228d2f19a83e5bb14d54355db86fcebf -# Nginx will fail a reload with [EMERG] without the presence of these files. - -# PLEASE READ UPDATED CONFIGURATION INSTRUCTIONS BEFORE USING THIS - -# Save this file as /usr/sbin/updatenginxblocker -# Make it Executable chmod 700 /usr/sbin/updatenginxblocker - -# RUN THE UPDATE -# Here our script runs, pulls the latest update, reloads nginx and emails you a notification - -email="me@myemail.com" -send_email="Y" -conf_dir=/etc/nginx/conf.d -url=https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/conf.d/globalblacklist.conf - -service_cmd() { - # arch linux does not have a 'service' command - local svc= svc_list="service systemctl rc-service" - - for svc in $svc_list; do - svc=$(which $svc 2>/dev/null) - if [ -n "$svc" ]; then - echo $svc - exit 0 - fi - done -} - -wget_opts() { - local opts= - - # Busybox wget gives less verbose output by default - if [ -n "$(wget --help 2>/dev/null | grep "\-nv")" ]; then - opts="-nv" - fi - - opts="$opts -O $conf_dir/globalblacklist.conf" - echo $opts -} - -# require root -if [ "$(id -u)" != "0" ]; then - echo "This script must be run as root" 1>&2 - exit 1 -fi - -# default to service (centos does not have 'which' by default) -service=${service_cmd:-"service"} -email_report=$(mktemp) -options=$(wget_opts) - -# download update -mkdir -p $conf_dir -wget $url $options 2>&1 | tee $email_report - -# re-read configuration -if ! grep "Not Found" $email_report; then - $service nginx reload | tee -a $email_report -else - printf "\nDownload failed: not reloading nginx config\n" | tee -a $email_report -fi - -# email report -case "$send_email" in - y*|Y*) cat $email_report | mail -s "Nginx Bad Bot Blocker Updated" $email;; -esac - -rm -f $email_report - -exit $? - -# Add this as a cron to run daily / weekly as you like -# Here's a sample CRON entry to update every day at 10pm -# 00 22 * * * /usr/sbin/updatenginxblocker