erp5: add mariadb `character-set-server` and `collation-server` options.

software/erp5/instance-mariadb-schema.json

@@ -111,6 +111,16 @@
       "default": false,
       "type": "boolean"
     },
+    "character-set-server": {
+      "description": "The server default character set",
+      "default": "utf8mb4",
+      "type": "string"
+    },
+    "collation-server": {
+      "description": "The server default collation",
+      "default": "utf8mb4_general_ci",
+      "type": "string"
+    },
     "ssl": {
       "description": "Enable and define SSL support for network connections",
       "default": {},

stack/erp5/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = d10b8e35b02b5391cf46bf0c7dbb1196
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 2daa3aaa1263705c4628864230049c67
+md5sum = b664a2221077db5db498422b6c90f015
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -42,7 +42,7 @@ md5sum = 43556e5bca8336dd543ae8068512aa6d
 
 [template-my-cnf]
 filename = my.cnf.in
-md5sum = 1de449e8c0c4a85c5ce2b447785b7654
+md5sum = c0bde08ec6bd6d333315a15026266b65
 
 [template-mariadb-initial-setup]
 filename = mariadb_initial_setup.sql.in

stack/erp5/instance-mariadb.cfg.in

@@ -142,6 +142,8 @@ innodb-log-file-size = {{ dumps(slapparameter_dict.get('innodb-log-file-size', 0
 innodb-file-per-table = {{ dumps(slapparameter_dict.get('innodb-file-per-table', 0)) }}
 innodb-log-buffer-size = {{ dumps(slapparameter_dict.get('innodb-log-buffer-size', 0)) }}
 relaxed-writes = {{ dumps(slapparameter_dict.get('relaxed-writes', False)) }}
+character-set-server = {{ dumps(slapparameter_dict.get('character-set-server', 'utf8mb4')) }}
+collation-server = {{ dumps(slapparameter_dict.get('collation-server', 'utf8mb4_general_ci')) }}
 {% if incremental_backup_retention_days > -1 -%}
 binlog-path = ${directory:mariadb-backup-incremental}/binlog
 # XXX: binlog rotation happens along with other log's rotation

stack/erp5/my.cnf.in

@@ -76,9 +76,8 @@ relay-log = mariadb-relay-bin
 {{x}}innodb_doublewrite = 0
 {{x}}sync_frm = 0
 
-# Force utf8 usage
-character_set_server = utf8mb4
-collation_server = utf8mb4_general_ci
+character_set_server = {{ parameter_dict['character-set-server'] }}
+collation_server = {{ parameter_dict['collation-server'] }}
 skip_character_set_client_handshake
 
 {% if 'ssl-key' in parameter_dict -%}