starred/appstore
1
0
Fork 0
mirror of https://github.com/okxlin/appstore.git synced 2026-09-25 08:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Pterodactyl MariaDB dependency selection

Browse Source 
Allow the Pterodactyl China install form to select MariaDB services while keeping Laravel's DB_CONNECTION set to mysql for both MySQL and MariaDB backends.

Also close the existing compose/env gaps for MAIL_PASSWORD, PANEL_DB_PORT, and PANEL_RECAPTCHA_ENABLED so the app validates cleanly before runtime smoke testing.

Refs #3172
This commit is contained in:
okxlin
2026-06-26 17:56:52 +08:00
parent bb6e75de01
commit d91e5ca3bb
6 changed files with 76 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/pterodactyl-china/1.13.0.0/.env.sample
+1
View File
@@ -9,6 +9,7 @@ MAIL_FROM="noreply@example.com"
MAIL_HOST="mail"
MAIL_PORT="1025"
MAIL_USERNAME=""
MAIL_PASSWORD=""
PANEL_APP_PORT_HTTP="40222"
PANEL_APP_URL="http://localhost:40222"
PANEL_DB_HOST="mysql"
apps/pterodactyl-china/1.13.0.0/data.yml
+35
View File
@@ -53,6 +53,25 @@ additionalProperties:
values:
- label: "MySQL"
value: mysql
- label: "MariaDB"
value: mariadb
- default: 3306
edit: true
envKey: PANEL_DB_PORT
labelEn: Database Port
labelZh: 数据库端口
label:
en: 'Database Port'
zh: '数据库端口'
zh-Hant: '資料庫連接埠'
ja: 'データベースポート'
ko: '데이터베이스 포트'
ru: 'Порт базы данных'
ms: 'Port pangkalan data'
pt-br: 'Porta do banco de dados'
required: true
rule: paramPort
type: number
- default: pterodactyl
envKey: PANEL_DB_NAME
labelEn: Database
@@ -302,6 +321,22 @@ additionalProperties:
pt-br: 'Nome de usuário do e-mail'
required: false
type: text
- default: ''
edit: true
envKey: MAIL_PASSWORD
labelEn: Mail Password
labelZh: 邮件密码
label:
en: 'Mail Password'
zh: '邮件密码'
zh-Hant: '郵件密碼'
ja: 'メールパスワード'
ko: '메일 비밀번호'
ru: 'Пароль почты'
ms: 'Kata laluan e-mel'
pt-br: 'Senha do e-mail'
required: false
type: password
- default: "true"
edit: true
envKey: MAIL_ENCRYPTION
apps/pterodactyl-china/1.13.0.0/docker-compose.yml
+2 -2
View File
@@ -12,7 +12,7 @@ services:
environment:
- USER_UID=${USER_UID}
- USER_GID=${USER_GID}
- DB_CONNECTION=${PANEL_DB_TYPE}
- DB_CONNECTION=mysql
- DB_HOST=${PANEL_DB_HOST}
- DB_PORT=${PANEL_DB_PORT}
- DB_DATABASE=${PANEL_DB_NAME}
@@ -35,7 +35,7 @@ services:
- QUEUE_DRIVER=${QUEUE_DRIVER}
- REDIS_HOST=${REDIS_HOST}
- REDIS_PASSWORD=${PANEL_REDIS_ROOT_PASSWORD}
- RECAPTCHA_ENABLED=${RECAPTCHA_ENABLED}
- RECAPTCHA_ENABLED=${PANEL_RECAPTCHA_ENABLED}
restart: always
networks:
- 1panel-network
apps/pterodactyl-china/latest/.env.sample
+1
View File
@@ -9,6 +9,7 @@ MAIL_FROM="noreply@example.com"
MAIL_HOST="mail"
MAIL_PORT="1025"
MAIL_USERNAME=""
MAIL_PASSWORD=""
PANEL_APP_PORT_HTTP="40222"
PANEL_APP_URL="http://localhost:40222"
PANEL_DB_HOST="mysql"
apps/pterodactyl-china/latest/data.yml
+35
View File
@@ -53,6 +53,25 @@ additionalProperties:
values:
- label: "MySQL"
value: mysql
- label: "MariaDB"
value: mariadb
- default: 3306
edit: true
envKey: PANEL_DB_PORT
labelEn: Database Port
labelZh: 数据库端口
label:
en: 'Database Port'
zh: '数据库端口'
zh-Hant: '資料庫連接埠'
ja: 'データベースポート'
ko: '데이터베이스 포트'
ru: 'Порт базы данных'
ms: 'Port pangkalan data'
pt-br: 'Porta do banco de dados'
required: true
rule: paramPort
type: number
- default: pterodactyl
envKey: PANEL_DB_NAME
labelEn: Database
@@ -302,6 +321,22 @@ additionalProperties:
pt-br: 'Nome de usuário do e-mail'
required: false
type: text
- default: ''
edit: true
envKey: MAIL_PASSWORD
labelEn: Mail Password
labelZh: 邮件密码
label:
en: 'Mail Password'
zh: '邮件密码'
zh-Hant: '郵件密碼'
ja: 'メールパスワード'
ko: '메일 비밀번호'
ru: 'Пароль почты'
ms: 'Kata laluan e-mel'
pt-br: 'Senha do e-mail'
required: false
type: password
- default: "true"
edit: true
envKey: MAIL_ENCRYPTION
apps/pterodactyl-china/latest/docker-compose.yml
+2 -2
View File
@@ -12,7 +12,7 @@ services:
environment:
- USER_UID=${USER_UID}
- USER_GID=${USER_GID}
- DB_CONNECTION=${PANEL_DB_TYPE}
- DB_CONNECTION=mysql
- DB_HOST=${PANEL_DB_HOST}
- DB_PORT=${PANEL_DB_PORT}
- DB_DATABASE=${PANEL_DB_NAME}
@@ -35,7 +35,7 @@ services:
- QUEUE_DRIVER=${QUEUE_DRIVER}
- REDIS_HOST=${REDIS_HOST}
- REDIS_PASSWORD=${PANEL_REDIS_ROOT_PASSWORD}
- RECAPTCHA_ENABLED=${RECAPTCHA_ENABLED}
- RECAPTCHA_ENABLED=${PANEL_RECAPTCHA_ENABLED}
restart: always
networks:
- 1panel-network