Skip to content

Commit 6fd57aa

Browse files
committed
Add 'collation-server' and 'character-set-server' configuration
1 parent 85a5d99 commit 6fd57aa

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

defaults/main.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,15 @@ mysql_binlog_format: "ROW"
133133
mysql_expire_logs_days: "10"
134134
mysql_replication_role: ''
135135
mysql_replication_master: ''
136+
136137
# Same keys as `mysql_users` above.
137138
mysql_replication_user: []
138139

139140
# Mysql Conf
140141
mysql_default_storage_engine: "INNODB"
142+
143+
# Default character set server
144+
# mysql_character_set_server: "utf8mb4"
145+
146+
# Default collation server
147+
# mysql_collation_server: "utf8mb4_bin"

templates/my.cnf.j2

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@ pid-file = {{ mysql_pid_file }}
1414
{% if mysql_skip_name_resolve %}
1515
skip-name-resolve
1616
{% endif %}
17-
{% if mysql_sql_mode %}
17+
{% if mysql_sql_mode is defined %}
1818
sql_mode = {{ mysql_sql_mode }}
1919
{% endif %}
20-
{% if mysql_default_storage_engine %}
20+
{% if mysql_default_storage_engine is defined %}
2121
default-storage-engine = {{ mysql_default_storage_engine }}
2222
{% endif %}
23+
{% if mysql_character_set_server is defined %}
24+
character-set-server = {{ mysql_character_set_server }}
25+
{% endif %}
26+
{% if mysql_collation_server is defined %}
27+
collation-server = {{ mysql_collation_server }}
28+
{% endif %}
2329

2430
# Logging configuration.
2531
{% if mysql_log_error == 'syslog' or mysql_log == 'syslog' %}

0 commit comments

Comments
 (0)