diff --git a/.travis.yml b/.travis.yml index 37e384ec0..b66c876cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,14 +46,14 @@ script: - bash .dev-tools/test-blocker-rate-limiting.sh - bash .dev-tools/test-blocker-whitelist.sh # HERE WE TEST update-ngxblocker setup-ngxblocker - DISABLED UNTIL FIXED - - bash .dev-tools/install-nginx-2.sh + #- bash .dev-tools/install-nginx-2.sh #- bash .dev-tools/test-blocker-quick.sh #- bash .dev-tools/install-nginx-3.sh #- bash .dev-tools/test-blocker-quick.sh #- bash .dev-tools/install-nginx-4.sh #- bash .dev-tools/test-blocker-quick.sh # FROM HERE WE TEST ANY NEW CHANGES TO THE BLOCKER - - bash .dev-tools/install-nginx-1.sh + #- bash .dev-tools/install-nginx-1.sh - bash .dev-tools/beta-install-nginx-testing-of-changes.sh - bash .dev-tools/beta-test-blocker.sh - bash .dev-tools/beta-test-blocker-badwords.sh diff --git a/setup-ngxblocker b/setup-ngxblocker index ab58a596f..b4fd129ee 100755 --- a/setup-ngxblocker +++ b/setup-ngxblocker @@ -426,8 +426,8 @@ main() { col_size=$(( $(longest_str $CONF_FILES) + $(echo $CONF_DIR | wc -m) + 10 )) # update main config - #line=$(find_includes $MAIN_CONF include last http first '\}' last ) - line=$(find_includes $MAIN_CONF include last include last '\}' last ) + line=$(find_includes $MAIN_CONF include last http first '\}' last ) + #line=$(find_includes $MAIN_CONF include last include last '\}' 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"