From 2d1e72c32312a819f49c4045ef565fcc9657317a Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Wed, 28 Jun 2017 15:33:20 +0200 Subject: [PATCH] Fix Travis CI Build Errors (strange cat errors that did not exist before causing generation of globalblacklist.conf to fail) --- travisCI/generate-blacklist.sh | 12 ++++++------ travisCI/globalblacklist.template | 7 +++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/travisCI/generate-blacklist.sh b/travisCI/generate-blacklist.sh index 4c0ab819c..dabe61b06 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 84183ce15..849341e73 100755 --- a/travisCI/globalblacklist.template +++ b/travisCI/globalblacklist.template @@ -2,12 +2,11 @@ ### THE ULTIMATE NGINX BAD BOT BLOCKER ### ********************************** -### Version Information # -### Versio I formatio # +### VERSION INFORMATION # ################################################### ### Version: V3.2017.06.624 -### Updated: Wed Ju### Versio I formatio ## -### Version Information ## +################################################### +### 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