Skip to content

Commit 076ab29

Browse files
Fix layout of globalblacklist.conf
1 parent 904501a commit 076ab29

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ This is a basic template for getting Travis CI's container based infrastructure
66

77
I actually use this a test playground for my Nginx Bad Bot Blocker - https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker so it's always changing but it will give you the basics of how to properly install Nginx on Travis.
88

9+
You certainly will not need all the scripts and extra things I run as part of this repo but a lot of it will come in very useful to you if you study what I have done here. This repository will certainly teach you the right and wrong ways of not only installing Nginx but also testing Nginx extra configurations like my Bad Bot Blocker and also correctly doing changes and commits to files during the Travis build and pushing that build back to your repository with a Version Tag / Release Number and the the commit of the modified file.
10+
11+
This comes from hundreds of hours of testing especially getting TravisCI to commit a file within a build, push it back to the live repo and not trigger another build in the process which throws TravisCI into an endless loop continually building and building until you actually fix the looping.
12+
13+
It all came down to a special little [ci-skip] tag added into the commit message.
14+
15+
My method's used here also make TravisCI do only one build and one build only, a lot of people seem to struggle with this logic as I see a lot of repo's having duplicate builds, one for master and then a subsequent build (without a push) which is a build using the Tag/Release. It's not needed and causes version numbering to always skip a number in the process and places unnecessary workloads onto the TravisCI build system. My way ensures your builds increment by 1 always, so if you last build number was 341, your next build tag will end with 342 and not 343.
16+
917
## The purpose of this repository?
1018

1119
Travis CI is a great system for checking and testing your build's Commits, Pull Requests and Merges. Travis runs everything inside a Docker container so it's a fully contained system that you can run build tests on your GIT repository and you can't break anything outside of it.

globalblacklist.conf

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
### THE ULTIMATE NGINX BAD BOT BLOCKER
33
### **********************************
44

5+
### Created By: https://github.com/mitchellkrogza/
6+
### Copyright Mitchell Krog - <mitchellkrog@gmail.com>
7+
58
### Version Information
69
############################################
710
### Version: V3.2017.05.389
@@ -15,14 +18,7 @@
1518
### and also has rate limiting functionality for bad bots who you only want to rate limit
1619
### and not actually block out entirely. It is powerful and also flexible.
1720

18-
### Created By: https://github.com/mitchellkrogza/
19-
### Copyright Mitchell Krog - <mitchellkrog@gmail.com>
20-
21-
### Originally Inspired By:
22-
### - https://github.com/mariusv/nginx-badbot-blocker
23-
### - https://github.com/oohnoitz/nginx-blacklist
24-
25-
### Tested on: nginx/1.10.0 (Ubuntu 16.04)
21+
### Tested on: nginx/1.10.x (Ubuntu 16.04)
2622

2723
### This list was developed and is in use on a live Nginx server running some very busy web sites.
2824
### It was built from the ground up using real data from daily logs and is updated almost daily.

0 commit comments

Comments
 (0)