Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add HEALTHCHECK to Dockerfile and append 10.0.0.0/8 to DNSBL whitelist

Browse Source
This commit is contained in:
bunkerity 2021-06-14 20:54:36 +02:00
parent 491d879fec
commit 3c721dc2a0
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -35,4 +35,6 @@ EXPOSE 8080/tcp 8443/tcp
USER nginx:nginx USER nginx:nginx
HEALTHCHECK --interval=30s --timeout=10s --start-period=120s --retries=3 CMD [ -f /tmp/nginx.pid ] || exit 1
ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"] ENTRYPOINT ["/opt/entrypoint/entrypoint.sh"]

1
autoconf/AutoConf.py
View File

@ -102,6 +102,7 @@ class AutoConf :
del self.__instances[id] del self.__instances[id]
else : else :
utils.log("[!] Initial config failed") utils.log("[!] Initial config failed")
# TODO : wait while unhealthy if not swarm
utils.log("[*] bunkerized-nginx instance created : " + name + " / " + id) utils.log("[*] bunkerized-nginx instance created : " + name + " / " + id)
elif event == "start" : elif event == "start" :

6
lua/dnsbl.lua
View File

@ -1,5 +1,5 @@
local M = {} local M = {}
local dns = require "dns" local dns = require "dns"
local logger = require "logger" local logger = require "logger"
local iputils = require "resty.iputils" local iputils = require "resty.iputils"
@ -12,7 +12,7 @@ function M.cached ()
end end
function M.check (dnsbls, resolvers) function M.check (dnsbls, resolvers)
local local_ips = iputils.parse_cidrs({"127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"}) local local_ips = iputils.parse_cidrs({"127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "10.0.0.0/8"})
if iputils.ip_in_cidrs(ngx.var.remote_addr, local_ips) then if iputils.ip_in_cidrs(ngx.var.remote_addr, local_ips) then
ngx.shared.dnsbl_cache:set(ngx.var.remote_addr, "ok", 86400) ngx.shared.dnsbl_cache:set(ngx.var.remote_addr, "ok", 86400)
return false return false