From a8a1f7b7826cf98d127c0707afd799ae356d1d4b Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Wed, 28 Jun 2017 16:39:29 +0200 Subject: [PATCH] Revert "Fix Travis CI Build Errors (strange cat errors that did not exist before causing generation of globalblacklist.conf to fail)" This reverts commit 2d1e72c32312a819f49c4045ef565fcc9657317a. --- travisCI/generate-blacklist.sh | 12 ++++++------ travisCI/globalblacklist.template | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/travisCI/generate-blacklist.sh b/travisCI/generate-blacklist.sh index dabe61b06..4c0ab819c 100755 --- a/travisCI/generate-blacklist.sh +++ b/travisCI/generate-blacklist.sh @@ -124,8 +124,8 @@ _start9="# START NIBBLER ### DO NOT EDIT THIS LINE AT ALL ###" _end9="# END NIBBLER ### DO NOT EDIT THIS LINE AT ALL ###" _start10="# START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ###" _end10="# END CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ###" -_startmarker="### VERSION INFORMATION #" -_endmarker="### VERSION INFORMATION ##" +_startmarker="### Version Information #" +_endmarker="### Version Information ##" # ********************************** # SET ALLOW OR DENY ACTION VARIABLES @@ -414,13 +414,13 @@ echo $_endmarker >> $_tmpnginxA IFS=$LASTUPDATEIFS mv $_tmpnginxA $_inputdbA ed -s $_inputdbA<<\IN -1,/### VERSION INFORMATION #/d -/### VERSION INFORMATION ##/,$d +1,/### Version Information #/d +/### Version Information ##/,$d ,d .r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/globalblacklist.template -/### VERSION INFORMATION #/x +/### Version Information #/x .t. -.,/### VERSION INFORMATION ##/-d +.,/### 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/travisCI/globalblacklist.template diff --git a/travisCI/globalblacklist.template b/travisCI/globalblacklist.template index 849341e73..84183ce15 100755 --- a/travisCI/globalblacklist.template +++ b/travisCI/globalblacklist.template @@ -2,11 +2,12 @@ ### THE ULTIMATE NGINX BAD BOT BLOCKER ### ********************************** -### VERSION INFORMATION # +### Version Information # +### Versio I formatio # ################################################### ### Version: V3.2017.06.624 -################################################### -### VERSION INFORMATION ## +### Updated: Wed Ju### Versio I formatio ## +### Version Information ## ### This file implements a checklist / blacklist for good user agents, bad user agents and ### bad referrers. It also has whitelisting for your own IP's and known good IP Ranges