Testing MariaDB 10.5

wo/cli/templates/my.mustache

@@ -41,7 +41,6 @@ tmpdir		= /tmp
 lc_messages_dir	= /usr/share/mysql
 lc_messages	= en_US
 skip-external-locking
-skip-name-resolve = 1
 #
 # Instead of skip-networking the default is now to listen only on
 # localhost which is more compatible and is not less secure.
@@ -191,5 +190,6 @@ key_buffer		= 16M
 # * IMPORTANT: Additional settings that can override those from this file!
 #   The files must end with '.cnf', otherwise they'll be ignored.
 #
+{{#newmariadb}}
 !include /etc/mysql/mariadb.cnf
-!includedir /etc/mysql/conf.d/
+!includedir /etc/mysql/conf.d/{{/newmariadb}}