opendev/system-config
Code Issues Proposed changes

Merge "Configure etherpad to use utf8mb4"

Browse Source
This commit is contained in:
Zuul 2020-04-08 21:16:26 +00:00 committed by Gerrit Code Review
commit 1b4ae0e7ff
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
playbooks/roles/etherpad/files/my.cnf
View File

@ -1,6 +1,6 @@
[client] [client]
# Default is Latin1, if you need UTF-8 set this (also in server section) # Default is Latin1, if you need UTF-8 set this (also in server section)
default-character-set = utf8 default-character-set = utf8mb4
[mysqld] [mysqld]
wait_timeout = 28800 wait_timeout = 28800
@ -9,7 +9,7 @@ wait_timeout = 28800
# #
# Default is Latin1, if you need UTF-8 set all this (also in client section) # Default is Latin1, if you need UTF-8 set all this (also in client section)
# #
character-set-server = utf8 character-set-server = utf8mb4
collation-server = utf8_bin collation-server = utf8mb4_bin
character_set_server = utf8 character_set_server = utf8mb4
collation_server = utf8_bin collation_server = utf8mb4_bin

1
playbooks/roles/etherpad/templates/settings.json.j2
View File

@ -26,6 +26,7 @@
"user" : "{{ etherpad_db_user }}", "user" : "{{ etherpad_db_user }}",
"host" : "localhost", "host" : "localhost",
"password": "{{ etherpad_db_password }}", "password": "{{ etherpad_db_password }}",
"charset" : "utf8mb4",
"database": "etherpad-lite" "database": "etherpad-lite"
}, },
//the default text of a pad //the default text of a pad