diff --git a/mysql/user.sls b/mysql/user.sls index a2f6c53..e729bf8 100644 --- a/mysql/user.sls +++ b/mysql/user.sls @@ -112,6 +112,7 @@ include: {% endif %} - user: {{ name }} - host: '{{ host }}' + - escape: {{ db['escape'] | default(True) }} - connection_host: '{{ mysql_host }}' - connection_user: '{{ mysql_salt_user }}' {% if mysql_salt_pass -%} diff --git a/pillar.example b/pillar.example index 0dfa2b0..006b2e9 100644 --- a/pillar.example +++ b/pillar.example @@ -106,6 +106,7 @@ mysql: databases: - database: foo grants: ['select', 'insert', 'update'] + escape: True - database: bar grants: ['all privileges'] bob: @@ -117,9 +118,14 @@ mysql: ssl-ISSUER: Name ssl-CIPHER: Cipher databases: - - database: foo + # https://github.com/saltstack/salt/issues/41178 + # If you want to refer to databases using wildcards, turn off escape so + # the renderer does not escape them, enclose the string in '`' and + # use two '%' + - database: '`foo\_%%`' grants: ['all privileges'] grant_option: True + escape: False - database: bar table: foobar grants: ['select', 'insert', 'update', 'delete']