Revert "Fix Travis CI Build Errors (strange cat errors that did not exist before causing generation of globalblacklist.conf to fail)"

This reverts commit 2d1e72c323.
This commit is contained in:
Mitchell Krog 2017-06-28 16:39:29 +02:00
parent ad83a3086e
commit a8a1f7b782
2 changed files with 10 additions and 9 deletions

View file

@ -124,8 +124,8 @@ _start9="# START NIBBLER ### DO NOT EDIT THIS LINE AT ALL ###"
_end9="# END 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 ###" _start10="# START CLOUDFLARE IP RANGES ### DO NOT EDIT THIS LINE AT ALL ###"
_end10="# END 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 #" _startmarker="### Version Information #"
_endmarker="### VERSION INFORMATION ##" _endmarker="### Version Information ##"
# ********************************** # **********************************
# SET ALLOW OR DENY ACTION VARIABLES # SET ALLOW OR DENY ACTION VARIABLES
@ -414,13 +414,13 @@ echo $_endmarker >> $_tmpnginxA
IFS=$LASTUPDATEIFS IFS=$LASTUPDATEIFS
mv $_tmpnginxA $_inputdbA mv $_tmpnginxA $_inputdbA
ed -s $_inputdbA<<\IN ed -s $_inputdbA<<\IN
1,/### VERSION INFORMATION #/d 1,/### Version Information #/d
/### VERSION INFORMATION ##/,$d /### Version Information ##/,$d
,d ,d
.r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/globalblacklist.template .r /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/globalblacklist.template
/### VERSION INFORMATION #/x /### Version Information #/x
.t. .t.
.,/### VERSION INFORMATION ##/-d .,/### Version Information ##/-d
#,p #,p
#,p used to print output replaced with w below to write #,p used to print output replaced with w below to write
w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/globalblacklist.template w /home/travis/build/mitchellkrogza/nginx-ultimate-bad-bot-blocker/travisCI/globalblacklist.template

View file

@ -2,11 +2,12 @@
### THE ULTIMATE NGINX BAD BOT BLOCKER ### THE ULTIMATE NGINX BAD BOT BLOCKER
### ********************************** ### **********************************
### VERSION INFORMATION # ### Version Information #
### Versio I formatio #
################################################### ###################################################
### Version: V3.2017.06.624 ### 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 ### 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 ### bad referrers. It also has whitelisting for your own IP's and known good IP Ranges