From 36c4f3e0657da416a18745232cebc9857cf80f3b Mon Sep 17 00:00:00 2001
From: bunkerity <contact@bunkerity.com>
Date: Fri, 6 Nov 2020 22:49:18 +0100
Subject: [PATCH] v1.1.2 - CrowdSec integration and custom ports

---
 README.md | 20 +++++++++++++++++++-
 VERSION   |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d8a5394..33af3da 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Non-exhaustive list of features :
 - Automatic ban of strange behaviors with fail2ban
 - Antibot challenge through cookie, javascript, captcha or recaptcha v3
 - Block TOR, proxies, bad user-agents, countries, ...
-- Perform automatic DNSBL checks to block known bad IP
+- Block known bad IP with DNSBL and CrowdSec
 - Prevent bruteforce attacks with rate limiting
 - Detect bad files with ClamAV
 - Easy to configure with environment variables
@@ -55,6 +55,7 @@ Fooling automated tools/scanners :
     + [Antibot](#antibot)
     + [External blacklist](#external-blacklist)
     + [DNSBL](#dnsbl)
+    + [CrowdSec](#crowdsec)
     + [Custom whitelisting](#custom-whitelisting)
     + [Custom blacklisting](#custom-blacklisting)
     + [Requests limiting](#requests-limiting)
@@ -199,6 +200,16 @@ Values : *\<any valid path to web files\>
 Default value : */www*  
 The default folder where nginx will search for web files. Don't change it unless you want to make your own image.
 
+`HTTP_PORT`  
+Values : *\<any valid port greater than 1024\>*  
+Default value : *8080*  
+The HTTP port number used by nginx and certbot inside the container.
+
+`HTTPS_PORT`  
+Values : *\<any valid port greater than 1024\>*  
+Default value : *8443*  
+The HTTPS port number used by nginx inside the container.
+
 ### Information leak
 
 `SERVER_TOKENS`  
@@ -514,6 +525,13 @@ Values : *\<list of DNS zones separated with spaces\>*
 Default value : *bl.blocklist.de problems.dnsbl.sorbs.net sbl.spamhaus.org xbl.spamhaus.org*  
 The list of DNSBL zones to query when `USE_DNSBL` is set to *yes*.
 
+### CrowdSec
+
+`USE_CROWDSEC`  
+Values : *yes* | *no*  
+Default value : *no*  
+If set to *yes*, [CrowdSec](https://github.com/crowdsecurity/crowdsec) will be enabled with the [nginx collection](https://hub.crowdsec.net/author/crowdsecurity/collections/nginx). API pulls will be done automaticaly.
+
 ### Custom whitelisting
 
 `USE_WHITELIST_IP`  
diff --git a/VERSION b/VERSION
index 524cb55..45a1b3f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.1
+1.1.2