DISTRO TESTS setup-ngxblocker

REF: #256 REF: #266
This commit is contained in:
Mitchell Krog 2019-07-02 13:42:17 +02:00
parent 21540af817
commit cee08ad4bd
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
2 changed files with 64 additions and 31 deletions

View file

@ -427,8 +427,7 @@ main() {
# update main config
#line=$(find_includes $MAIN_CONF include last http first '\}' last )
#line=$(find_includes $MAIN_CONF include first http first '\}' last )
line=$(find_includes $MAIN_CONF '#' first http first '\}' last )
line=$(find_includes $MAIN_CONF sendfile last http first '\}' last )
if [ -n "$(check_wildcard $MAIN_CONF $CONF_DIR)" ]; then # also recalculate column width
col_size=$(( $(longest_str $VHOST_INCLUDES) + $(echo $BOTS_DIR | wc -m) + 10 ))
printf "%-10s %-${col_size}s %s\n" "INFO:" "$CONF_DIR/* detected" "=> $MAIN_CONF"