From bc3bf8480b7869643aa5e06ad748565e5aa1ac9f Mon Sep 17 00:00:00 2001 From: Mitchell Krog UB1 Date: Tue, 6 Jun 2017 11:58:22 +0200 Subject: [PATCH] Referers / Bots (+/-) --- .../etc/nginx/conf.d/globalblacklist.conf | 6 +++--- conf.d/globalblacklist.conf | 6 +++--- travisCI/change-file.sh | 2 +- travisCI/modify-globalblacklist.sh | 8 ++------ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf index 9e91563a0..96d43ad1b 100755 --- a/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf +++ b/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf @@ -4,9 +4,9 @@ ### Version Information # ############################################ -### Version: V3.2017.06.546 -### Updated: Tue Jun 6 11:11:22 SAST 2017 -### Generated In: 0.0273530483246 seconds +### Version: V3.2017.06 +### Updated: Tue Jun 6 11:58:22 SAST 2017 +### Generated In: 0.304285287857 seconds ############################################ ### Version Information ## diff --git a/conf.d/globalblacklist.conf b/conf.d/globalblacklist.conf index 4f9f9bba4..96d43ad1b 100644 --- a/conf.d/globalblacklist.conf +++ b/conf.d/globalblacklist.conf @@ -4,9 +4,9 @@ ### Version Information # ############################################ -### Version: V3.2017.06.549 -### Updated: Tue Jun 6 11:33:55 SAST 2017 -### Generated In: 0.00355124473572 seconds +### Version: V3.2017.06 +### Updated: Tue Jun 6 11:58:22 SAST 2017 +### Generated In: 0.304285287857 seconds ############################################ ### Version Information ## diff --git a/travisCI/change-file.sh b/travisCI/change-file.sh index 4861cc8ab..a366b47ae 100755 --- a/travisCI/change-file.sh +++ b/travisCI/change-file.sh @@ -30,7 +30,7 @@ git add $TRAVIS_BUILD_DIR/README.md git add $TRAVIS_BUILD_DIR/AUTO-CONFIGURATION.md git add $TRAVIS_BUILD_DIR/MANUAL-CONFIGURATION.md git add $TRAVIS_BUILD_DIR/conf.d/globalblacklist.conf -git add $TRAVIS_BUILD_DIR/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf +git add $TRAVIS_BUILD_DIR/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf git commit -am "V3.$YEAR.$MONTH.$TRAVIS_BUILD_NUMBER [ci skip]" # Travis now moves to the before_deploy: section of .travis.yml \ No newline at end of file diff --git a/travisCI/modify-globalblacklist.sh b/travisCI/modify-globalblacklist.sh index d437a7b46..4e0b76076 100755 --- a/travisCI/modify-globalblacklist.sh +++ b/travisCI/modify-globalblacklist.sh @@ -13,10 +13,6 @@ MY_GIT_TAG=V3.$versionyear.$versionmonth.$TRAVIS_BUILD_NUMBER _inputdbA=/tmp/lastupdated.db # Declare Nginx template and temp variables -#_nginx=/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/conf.d/globalblacklist.conf -#_nginx2=/home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf - - _tmpnginxA=tmpnginxA _tmpnginxB=tmpnginxB @@ -67,13 +63,13 @@ ed -s $_inputdbA<<\IN 1,/### Version Information #/d /### Version Information ##/,$d ,d -.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf +.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf /### Version Information #/x .t. .,/### Version Information ##/-d #,p #,p used to print output replaced with w below to write -w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf +w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/_sample_config_files/Engintron_for_cPanel_WHM_Configuration_Example/etc/nginx/conf.d/globalblacklist.conf q IN rm $_inputdbA