FIX check_wildcard in setup-ngxblocker

This commit is contained in:
Mitchell Krog 2019-07-03 15:03:47 +02:00
parent 623539b6b5
commit 8d9362cc63
No known key found for this signature in database
GPG key ID: C243C388553EDE5D
2 changed files with 2 additions and 2 deletions

View file

@ -33,7 +33,7 @@ http {
# Load modular configuration files from the /etc/nginx/conf.d directory.
# See http://nginx.org/en/docs/ngx_core_module.html#include
# for more information.
#include /etc/nginx/conf.d/*.conf;
include /etc/nginx/conf.d/*.conf;
server {
listen 80 default_server;

View file

@ -175,7 +175,7 @@ longest_str() {
check_wildcard() {
local file=$1 dir=$(basename $2)
local check="$(grep -E "include[[:alnum:] /]+$dir/\*" $file)"
local check="$(grep -E "^[^#]+include[[:alnum:] /]+$dir/\*" $file)"
echo $check
}