From be94f05ab0fa573cdbd6cbfe6cc73102df7143da Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: May 13 2020 17:47:59 +0000 Subject: Test non-"web_*" roles for nginx config Historically, we named roles involving a web server "web_*", and this still makes sense for roles that are "mostly a webserver" like web_static and web_jekyll. However, some roles (for example mailman3 and matrix) are "lots of things, and a webserver as side job". Forcing them into the web_* name scheme wouldn't make sense IMHO. Therefore change test_nginx.sh to test all roles instead of only web_* Note that "all roles" sounds more than it is. The script greps pillar/role/$role.sls for "nginx", so in practise it will still only test roles that actually include nginx config in their pillar data. --- diff --git a/bin/test_nginx.sh b/bin/test_nginx.sh index 133eed5..1351d84 100755 --- a/bin/test_nginx.sh +++ b/bin/test_nginx.sh @@ -47,7 +47,7 @@ create_fake_certs() { cp -a /etc/nginx /etc/nginx_orig -WEB_ROLES=( $(bin/get_roles.py | grep web_) ) +WEB_ROLES=( $(bin/get_roles.py) ) for role in ${WEB_ROLES[@]}; do if grep nginx salt/role/$role.sls > /dev/null; then