D3070.id7830.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3070.id7830.diff
View Options

	diff --git a/pillar/dbserver/cluster-B.sls b/pillar/dbserver/cluster-B.sls
	--- a/pillar/dbserver/cluster-B.sls
	+++ b/pillar/dbserver/cluster-B.sls
	@@ -24,7 +24,7 @@
	scope: table
	privileges: SELECT, INSERT
	tables:
	- - "lyrics_%"
	+ - lyrics_sneakers

	saas-mediawiki:
	password: dbserver/cluster-B/users/saas-mediawiki
	@@ -43,7 +43,8 @@
	- database: nasqueron_wiki
	scope: database

	- # Tips for databases:
	+ # Notes for databases encoding and collation:
	+ #
	# This is a MariaDB cluster. At version 10.6, MariaDB is still using utf8mb3
	# by default, but we generally prefer utf8mb4 as encoding.
	#
	@@ -51,6 +52,9 @@
	# It's a accent (in)sensitive case (in)sensitive based on Unicode 9.0.
	# For MariaDB 10.10+, we can use uca1400_as_ci, that's Unicode 14.0.
	#
	+ # We note it with the full name utf8mb4_uca1400_as_ci, something not needed
	+ # for manual requests, but allowing mysql_database.present to check equality.
	+ #
	# TRANSITION NOTE. On MariaDB 10.6, utf8mb4_unicode_520_ci is the "newest".
	# From 2023-04-15, we starting to use uca1400_as_ci as default collation.

	@@ -58,14 +62,14 @@
	# Database used by IRC eggdrops
	Nasqueron: &unicode
	encoding: utf8mb4
	- collation: uca1400_as_ci
	+ collation: utf8mb4_uca1400_as_ci
	datacubes: *unicode
	datasource_lyrics: *unicode

	# Databases used by MediaWiki SaaS
	wikis: &mediawiki
	encoding: utf8mb4
	- collation: utf8_bin
	+ collation: utf8mb4_bin
	arsmagica: *mediawiki
	inidal_wiki: *mediawiki
	nasqueron_wiki: *mediawiki