mirror of
https://github.com/bunkerity/bunkerized-nginx
synced 2023-12-13 21:30:18 +01:00
various fixes - autoconf process order, multisite config and examples
This commit is contained in:
parent
0026328f25
commit
dc382c3e04
|
@ -72,11 +72,20 @@ try :
|
||||||
except docker.errors.APIError as e :
|
except docker.errors.APIError as e :
|
||||||
utils.log("[!] Docker API error " + str(e))
|
utils.log("[!] Docker API error " + str(e))
|
||||||
sys.exit(3)
|
sys.exit(3)
|
||||||
|
# Process instances first
|
||||||
|
for instance in before :
|
||||||
|
if "bunkerized-nginx.AUTOCONF" in instance.labels :
|
||||||
|
if instance.status in ("restarting", "running", "created", "exited") :
|
||||||
|
process(instance, "create")
|
||||||
|
if instance.status == "running" :
|
||||||
|
process(instance, "start")
|
||||||
|
# Containers after
|
||||||
for container in before :
|
for container in before :
|
||||||
if container.status in ("restarting", "running", "created", "exited") :
|
if "bunkerized-nginx.SERVER_NAME" in container.labels :
|
||||||
process(container, "create")
|
if container.status in ("restarting", "running", "created", "exited") :
|
||||||
if container.status == "running" :
|
process(container, "create")
|
||||||
process(container, "start")
|
if container.status == "running" :
|
||||||
|
process(container, "start")
|
||||||
|
|
||||||
# Process events received from Docker
|
# Process events received from Docker
|
||||||
try :
|
try :
|
||||||
|
|
|
@ -14,6 +14,9 @@ find /etc/nginx -type d -exec chmod 750 {} \;
|
||||||
if [ "$MULTISITE" = "yes" ] ; then
|
if [ "$MULTISITE" = "yes" ] ; then
|
||||||
servers=$(find /etc/nginx -name "server.conf" | cut -d '/' -f 4)
|
servers=$(find /etc/nginx -name "server.conf" | cut -d '/' -f 4)
|
||||||
for server in $servers ; do
|
for server in $servers ; do
|
||||||
|
if [ "$server" = "server.conf" ] ; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
SERVER_PREFIX="/etc/nginx/${server}/"
|
SERVER_PREFIX="/etc/nginx/${server}/"
|
||||||
if grep "/etc/letsencrypt/live" ${SERVER_PREFIX}https.conf > /dev/null && [ ! -f /etc/letsencrypt/live/${server}/fullchain.pem ] ; then
|
if grep "/etc/letsencrypt/live" ${SERVER_PREFIX}https.conf > /dev/null && [ ! -f /etc/letsencrypt/live/${server}/fullchain.pem ] ; then
|
||||||
/opt/scripts/certbot-new.sh "$server" "$(cat ${SERVER_PREFIX}email-lets-encrypt.txt)"
|
/opt/scripts/certbot-new.sh "$server" "$(cat ${SERVER_PREFIX}email-lets-encrypt.txt)"
|
||||||
|
|
|
@ -30,6 +30,8 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
- autoconf:/etc/nginx
|
- autoconf:/etc/nginx
|
||||||
|
depends_on:
|
||||||
|
- mywww
|
||||||
|
|
||||||
myapp1:
|
myapp1:
|
||||||
image: php:fpm
|
image: php:fpm
|
||||||
|
|
|
@ -21,6 +21,8 @@ services:
|
||||||
- USE_GZIP=yes
|
- USE_GZIP=yes
|
||||||
- USE_BROTLI=yes
|
- USE_BROTLI=yes
|
||||||
- USE_REVERSE_PROXY=yes
|
- USE_REVERSE_PROXY=yes
|
||||||
|
labels:
|
||||||
|
- "bunkerized-nginx.AUTOCONF"
|
||||||
|
|
||||||
myautoconf:
|
myautoconf:
|
||||||
image: bunkerity/bunkerized-nginx-autoconf
|
image: bunkerity/bunkerized-nginx-autoconf
|
||||||
|
@ -28,6 +30,8 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
- autoconf:/etc/nginx
|
- autoconf:/etc/nginx
|
||||||
|
depends_on:
|
||||||
|
- mywww
|
||||||
|
|
||||||
myapp1:
|
myapp1:
|
||||||
build: js-app
|
build: js-app
|
||||||
|
|
|
@ -3,7 +3,7 @@ version: '3'
|
||||||
services:
|
services:
|
||||||
|
|
||||||
myreverse:
|
myreverse:
|
||||||
image: bunkerity/bunkerized-nginx:dev
|
image: bunkerity/bunkerized-nginx
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- 80:8080
|
- 80:8080
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
bantime = %FAIL2BAN_BANTIME%
|
bantime = %FAIL2BAN_BANTIME%
|
||||||
findtime = %FAIL2BAN_FINDTIME%
|
findtime = %FAIL2BAN_FINDTIME%
|
||||||
maxretry = %FAIL2BAN_MAXRETRY%
|
maxretry = %FAIL2BAN_MAXRETRY%
|
||||||
|
ignoreip = %FAIL2BAN_IGNOREIP%
|
||||||
enabled = true
|
enabled = true
|
||||||
action = nginx-action
|
action = nginx-action
|
||||||
logpath = /var/log/access.log
|
logpath = /var/log/access.log
|
||||||
|
|
Loading…
Reference in a new issue