Add a default option (#302)

* Add a default option to prevent returning an empty string to match.compound removing error addressed in #297 * Clean up outdated refrences of `mailman` in users.sls * Restore mailman group bits
python · Feb 8, 2023 · 24fae9b · 24fae9b
1 parent b19e31d
commit 24fae9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/pillar/base/users.sls b/pillar/base/users.sls
@@ -80,9 +80,6 @@ users:
         allowed: True
         groups:
           - downloads
-      mailman:
-        allowed: True
-        sudo: True
       mail:
         allowed: True
         sudo: True

diff --git a/salt/users/init.sls b/salt/users/init.sls
@@ -4,7 +4,7 @@ include:
 {% for user_name, user_config in salt["pillar.get"]("users", {}).items() %}
 {% set admin = user_config.get("admin", false) %}
 {% set access = {} %}
-{% for pat, data in user_config.get("access", {}).items() if salt["match.compound"](salt["pillar.get"]("roles:" + pat + ":pattern")) %}  # " Syntax fix
+{% for pat, data in user_config.get("access", {}).items() if salt["match.compound"](salt["pillar.get"]("roles:" + pat + ":pattern", "devnull.psf.io")) %}  # " Syntax fix
   {% do access.update(data) %}
 {% endfor %}
 
@@ -22,7 +22,7 @@ include:
 {% for user_name, user_config in salt["pillar.get"]("users", {}).items() %}
 {% set admin = user_config.get("admin", false) %}
 {% set access = {} %}
-{% for pat, data in user_config.get("access", {}).items() if salt["match.compound"](salt["pillar.get"]("roles:" + pat + ":pattern")) %}  # " Syntax fix
+{% for pat, data in user_config.get("access", {}).items() if salt["match.compound"](salt["pillar.get"]("roles:" + pat + ":pattern", "devnull.psf.io")) %}  # " Syntax fix
   {% do access.update(data) %}
 {% endfor %}