Merge branch 'pre_server_confs' of https://github.com/thelittlefireman/bunkerized-nginx into dev

This commit is contained in:
root 2021-03-08 11:47:45 +01:00
commit f052a25168
3 changed files with 5 additions and 0 deletions

View file

@ -1226,6 +1226,7 @@ The number of days before rotated files are deleted.
Custom configurations files (ending with .conf suffix) can be added in some directory inside the container :
- /http-confs : http context
- /server-confs : server context
- /pre-server-confs : before server context (add map or upstream config)
You just need to use a volume like this :
```shell

View file

@ -1,3 +1,5 @@
%PRE_SERVER_CONF%
server {
%FASTCGI_PATH%
%SERVER_CONF%

View file

@ -47,8 +47,10 @@ cp /opt/confs/site/* "$NGINX_PREFIX"
replace_in_file "${NGINX_PREFIX}server.conf" "%MAIN_LUA%" "include ${NGINX_PREFIX}main-lua.conf;"
if [ "$MULTISITE" = "yes" ] ; then
replace_in_file "${NGINX_PREFIX}server.conf" "%SERVER_CONF%" "include /server-confs/*.conf;\ninclude /server-confs/${1}/*.conf;"
replace_in_file "${NGINX_PREFIX}server.conf" "%PRE_SERVER_CONF%" "include /pre-server-confs/*.conf;\ninclude /pre-server-confs/${1}/*.conf;"
else
replace_in_file "${NGINX_PREFIX}server.conf" "%SERVER_CONF%" "include /server-confs/*.conf;"
replace_in_file "${NGINX_PREFIX}server.conf" "%PRE_SERVER_CONF%" "include /pre-server-confs/*.conf;\ninclude /pre-server-confs/${1}/*.conf;"
fi
# max body size