Skip to content

Commit 98ddf87

Browse files
authored
Update docs to specify utf8mb4 default (#11962)
Install tool already sets it as the default so we can just update example ini and docs to it. Fixes: #11081
1 parent 1fb783e commit 98ddf87

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

custom/conf/app.example.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,9 @@ SCHEMA =
375375
; For Postgres, either "disable" (default), "require", or "verify-full"
376376
; For MySQL, either "false" (default), "true", or "skip-verify"
377377
SSL_MODE = disable
378-
; For MySQL only, either "utf8" or "utf8mb4", default is "utf8".
378+
; For MySQL only, either "utf8" or "utf8mb4", default is "utf8mb4".
379379
; NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this.
380-
CHARSET = utf8
380+
CHARSET = utf8mb4
381381
; For "sqlite3" and "tidb", use an absolute path when you start gitea as service
382382
PATH = data/gitea.db
383383
; For "sqlite3" only. Query timeout

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
245245
- `require`: Enable TLS without any verifications.
246246
- `verify-ca`: Enable TLS with verification of the database server certificate against its root certificate.
247247
- `verify-full`: Enable TLS and verify the database server name matches the given certificate in either the `Common Name` or `Subject Alternative Name` fields.
248-
- `CHARSET`: **utf8**: For MySQL only, either "utf8" or "utf8mb4", default is "utf8". NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this.
248+
- `CHARSET`: **utf8mb4**: For MySQL only, either "utf8" or "utf8mb4". NOTICE: for "utf8mb4" you must use MySQL InnoDB > 5.6. Gitea is unable to check this.
249249
- `PATH`: **data/gitea.db**: For SQLite3 only, the database file path.
250250
- `LOG_SQL`: **true**: Log the executed SQL.
251251
- `DB_RETRIES`: **10**: How many ORM init / DB connect attempts allowed.

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ menu:
8181
- `USER`: 数据库用户名。
8282
- `PASSWD`: 数据库用户密码。
8383
- `SSL_MODE`: MySQL 或 PostgreSQL数据库是否启用SSL模式。
84-
- `CHARSET`: **utf8**: 仅当数据库为 MySQL 时有效, 可以为 "utf8" 或 "utf8mb4"。注意:如果使用 "utf8mb4",你的 MySQL InnoDB 版本必须在 5.6 以上。
84+
- `CHARSET`: **utf8mb4**: 仅当数据库为 MySQL 时有效, 可以为 "utf8" 或 "utf8mb4"。注意:如果使用 "utf8mb4",你的 MySQL InnoDB 版本必须在 5.6 以上。
8585
- `PATH`: Tidb 或者 SQLite3 数据文件存放路径。
8686
- `LOG_SQL`: **true**: 显示生成的SQL,默认为真。
8787
- `MAX_IDLE_CONNS` **0**: 最大空闲数据库连接

0 commit comments

Comments
 (0)