User publisher_acl setting in salt master config even if used client_…

…acl in

pillar (backwards compatibility)

salt/files/master.d/f_defaults.conf

@@ -351,15 +351,15 @@ publisher_acl:
 {%- endfor -%}
 {% elif 'client_acl' in cfg_master -%}
 {%- do default_keys.append('client_acl') %}
-client_acl:
+publisher_acl:
 {%- for name, user in cfg_master['client_acl']|dictsort %}
   {{ name}}:
 {%- for command in user %}
     - {% raw %}'{% endraw %}{{ command }}{% raw %}'{% endraw %}
 {%- endfor -%}
 {%- endfor -%}
 {% elif 'client_acl' in cfg_salt -%}
-client_acl:
+publisher_acl:
 {%- for name, user in cfg_salt['client_acl']|dictsort %}
   {{ name }}:
 {%- for command in user %}
@@ -401,7 +401,7 @@ publisher_acl_blacklist:
   {% endfor %}
 {% elif 'client_acl_blacklist' in cfg_master %}
 {%- do default_keys.append('client_acl_blacklist') %}
-client_acl_blacklist:
+publisher_acl_blacklist:
   users:
   {% for user in cfg_master['client_acl_blacklist'].get('users', []) %}
     - {{ user }}
@@ -411,7 +411,7 @@ client_acl_blacklist:
     - {{ mod }}
   {% endfor %}
 {% elif 'client_acl_blacklist' in cfg_salt  %}
-client_acl_blacklist:
+publisher_acl_blacklist:
   users:
   {% for user in cfg_salt['client_acl_blacklist'].get('users', []) %}
     - {{ user }}
@@ -421,15 +421,15 @@ client_acl_blacklist:
     - {{ mod }}
   {% endfor %}
 {% else %}
-#client_acl_blacklist:
+#publisher_acl_blacklist:
 #  users:
 #    - root
 #    - '^(?!sudo_).*$'   #  all non sudo users
 #  modules:
 #    - cmd
 {% endif %}
 
-# Enforce client_acl & client_acl_blacklist when users have sudo
+# Enforce publisher_acl & publisher_acl_blacklist when users have sudo
 # access to the salt command.
 {{ get_config('sudo_acl', 'False') }}