Merge setup-ngxblocker master with test version [ci skip]

This commit is contained in:
Mitchell Krog 2019-09-11 10:23:20 +02:00
parent 3267af8484
commit e08d38eeca
No known key found for this signature in database
GPG key ID: E02E9D10427B6A43

View file

@ -98,7 +98,7 @@ check_config() {
find_vhosts() { find_vhosts() {
local ans= local ans=
FILE_LIST=$(find $VHOST_DIR -type f -or -type l -name "*.$VHOST_EXT") FILE_LIST=$(find $VHOST_DIR \( -type f -or -type l \) -name "*.$VHOST_EXT")
if [ -z "$FILE_LIST" ]; then if [ -z "$FILE_LIST" ]; then
find $VHOST_DIR -type f find $VHOST_DIR -type f