From d624ba44275511da8f917bddee31c0731b20216a Mon Sep 17 00:00:00 2001 From: Matteo Ghia <61846068+Maestro-Zacht@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:01:57 +0100 Subject: [PATCH 1/3] set default collation in startup script --- docker/setup.base.sql | 2 +- docs/installation/allianceauth.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/setup.base.sql b/docker/setup.base.sql index ba4f3b43..a3daa8bb 100644 --- a/docker/setup.base.sql +++ b/docker/setup.base.sql @@ -1,6 +1,6 @@ CREATE USER 'aauth'@'%' IDENTIFIED BY 'authpass'; CREATE USER 'grafana'@'%' IDENTIFIED BY 'grafanapass'; -CREATE DATABASE alliance_auth CHARACTER SET utf8mb4; +CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; GRANT ALL PRIVILEGES ON alliance_auth.* TO 'aauth'@'%'; GRANT SELECT, diff --git a/docs/installation/allianceauth.md b/docs/installation/allianceauth.md index dd033b61..9560597c 100644 --- a/docs/installation/allianceauth.md +++ b/docs/installation/allianceauth.md @@ -246,7 +246,7 @@ and create them as follows, replacing `PASSWORD` with an actual secure password: ```sql CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'PASSWORD'; -CREATE DATABASE alliance_auth CHARACTER SET utf8mb4; +CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; GRANT ALL PRIVILEGES ON alliance_auth . * TO 'allianceserver'@'localhost'; ``` From ae7ed5c297b944368764ee3da1c6267f222a93f4 Mon Sep 17 00:00:00 2001 From: Matteo Ghia <61846068+Maestro-Zacht@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:45:31 +0100 Subject: [PATCH 2/3] add default keyword required by mariadb --- docker/setup.base.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/setup.base.sql b/docker/setup.base.sql index a3daa8bb..c9bbb96e 100644 --- a/docker/setup.base.sql +++ b/docker/setup.base.sql @@ -1,6 +1,6 @@ CREATE USER 'aauth'@'%' IDENTIFIED BY 'authpass'; CREATE USER 'grafana'@'%' IDENTIFIED BY 'grafanapass'; -CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; GRANT ALL PRIVILEGES ON alliance_auth.* TO 'aauth'@'%'; GRANT SELECT, From e053fb7d9688d83abe2379d77a7b522c19abf316 Mon Sep 17 00:00:00 2001 From: Matteo Ghia <61846068+Maestro-Zacht@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:45:59 +0100 Subject: [PATCH 3/3] also in baremetal docs --- docs/installation/allianceauth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation/allianceauth.md b/docs/installation/allianceauth.md index 9560597c..2b7c3924 100644 --- a/docs/installation/allianceauth.md +++ b/docs/installation/allianceauth.md @@ -246,7 +246,7 @@ and create them as follows, replacing `PASSWORD` with an actual secure password: ```sql CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'PASSWORD'; -CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +CREATE DATABASE alliance_auth CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; GRANT ALL PRIVILEGES ON alliance_auth . * TO 'allianceserver'@'localhost'; ```