diff --git a/cloudreve/4.0.0/data.yml b/cloudreve-mysql/4.0.0/data.yml similarity index 85% rename from cloudreve/4.0.0/data.yml rename to cloudreve-mysql/4.0.0/data.yml index eb076ce48..0c46250a3 100644 --- a/cloudreve/4.0.0/data.yml +++ b/cloudreve-mysql/4.0.0/data.yml @@ -21,28 +21,10 @@ additionalProperties: required: true type: service values: - - label: PostgreSQL - value: postgres - label: MySQL value: mysql - label: MariaDB - value: mysql - - default: 3306 - envKey: PANEL_DB_PORT - labelEn: Database Port - labelZh: 数据库端口 - label: - en: Database port - ja: データベース - ms: Pangkalan Data - pt-br: Banco de Dados - ru: База данных - ko: 데이터베이스 - zh: 数据库端口 - zh-Hant: 數據庫端口 - random: false - required: true - type: number + value: mariadb - default: cloudreve envKey: PANEL_DB_NAME labelEn: Database diff --git a/cloudreve/4.0.0/docker-compose.yml b/cloudreve-mysql/4.0.0/docker-compose.yml similarity index 87% rename from cloudreve/4.0.0/docker-compose.yml rename to cloudreve-mysql/4.0.0/docker-compose.yml index 58d1b7192..3c0c4be4f 100644 --- a/cloudreve/4.0.0/docker-compose.yml +++ b/cloudreve-mysql/4.0.0/docker-compose.yml @@ -6,12 +6,12 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5212 environment: - - CR_CONF_Database.Type=${PANEL_DB_TYPE} + - CR_CONF_Database.Type=mysql - CR_CONF_Database.Host=${PANEL_DB_HOST} - CR_CONF_Database.Name=${PANEL_DB_NAME} - CR_CONF_Database.User=${PANEL_DB_USER} - CR_CONF_Database.Password=${PANEL_DB_USER_PASSWORD} - - CR_CONF_Database.Port=${PANEL_DB_PORT} + - CR_CONF_Database.Port=3306 - CR_CONF_Redis.Server=${PANEL_REDIS_HOST}:6379 - CR_CONF_Redis.Password=${PANEL_REDIS_ROOT_PASSWORD} volumes: diff --git a/cloudreve/README.md b/cloudreve-mysql/README.md similarity index 100% rename from cloudreve/README.md rename to cloudreve-mysql/README.md diff --git a/cloudreve/data.yml b/cloudreve-mysql/data.yml similarity index 81% rename from cloudreve/data.yml rename to cloudreve-mysql/data.yml index 8a2e95da8..060c990f8 100644 --- a/cloudreve/data.yml +++ b/cloudreve-mysql/data.yml @@ -1,4 +1,4 @@ -name: Cloudreve +name: Cloudreve-mysql tags: - 云存储 title: 支持多家云存储的云盘系统 @@ -8,7 +8,7 @@ additionalProperties: name: Cloudreve tags: - Storage - shortDescZh: 支持多家云存储的云盘系统 + shortDescZh: 支持多家云存储的云盘系统，此应用为兼容mariadb和mysql专用 shortDescEn: Self-hosted file management system with muilt-cloud support type: website crossVersionUpdate: false diff --git a/cloudreve-mysql/logo.png b/cloudreve-mysql/logo.png new file mode 100644 index 000000000..90c8e6f3b Binary files /dev/null and b/cloudreve-mysql/logo.png differ diff --git a/cloudreve/logo.png b/cloudreve/logo.png deleted file mode 100644 index 1358b5d47..000000000 Binary files a/cloudreve/logo.png and /dev/null differ diff --git a/umami/2.18.1/data.yml b/umami-mysql/2.18.1/data.yml similarity index 83% rename from umami/2.18.1/data.yml rename to umami-mysql/2.18.1/data.yml index 538d98df3..3af2cf654 100644 --- a/umami/2.18.1/data.yml +++ b/umami-mysql/2.18.1/data.yml @@ -23,10 +23,8 @@ additionalProperties: values: - label: MySQL value: mysql - - label: PostgreSQL - value: postgresql - label: MariaDB - value: mysql + value: mariadb - default: umami envKey: PANEL_DB_NAME labelEn: Database @@ -77,21 +75,27 @@ additionalProperties: random: true required: true type: password - - default: redis - envKey: PANEL_REDIS_PASSWORD - labelEn: Redis Password - labelZh: Redis密码 - label: - en: Redis Password - ja: パスワード - ms: Kata Laluan - pt-br: Senha - ru: Пароль - ko: 비밀번호 - zh: Redis数据库用户密码 - zh-Hant: Redis數據庫用戶密碼 - random: true + - default: "" + envKey: PANEL_REDIS_HOST + key: redis + labelEn: Redis Service + labelZh: redis 服务 required: true + type: service + label: + en: Redis Service + ja: Redisサービス + ms: Perkhidmatan Redis + pt-br: Serviço Redis + ru: Сервис Redis + ko: Redis 서비스 + zh: redis 服务 + zh-Hant: redis 服务 + - default: "" + envKey: PANEL_REDIS_ROOT_PASSWORD + labelEn: Redis Service Password + labelZh: 缓存服务服务密码 + required: false type: password - default: 3000 envKey: PANEL_APP_PORT_HTTP diff --git a/umami/2.18.1/docker-compose.yml b/umami-mysql/2.18.1/docker-compose.yml similarity index 84% rename from umami/2.18.1/docker-compose.yml rename to umami-mysql/2.18.1/docker-compose.yml index e7db61cfc..5c4c7410d 100644 --- a/umami/2.18.1/docker-compose.yml +++ b/umami-mysql/2.18.1/docker-compose.yml @@ -1,6 +1,6 @@ services: umami: - image: ghcr.430070.xyz/umami-software/umami:${PANEL_DB_TYPE}-v2.18.1 + image: ghcr.430070.xyz/umami-software/umami:mysql-v2.18.1 container_name: ${CONTAINER_NAME} restart: always labels: diff --git a/umami/2.18.1/scripts/upgrade.sh b/umami-mysql/2.18.1/scripts/upgrade.sh similarity index 100% rename from umami/2.18.1/scripts/upgrade.sh rename to umami-mysql/2.18.1/scripts/upgrade.sh diff --git a/umami/README.md b/umami-mysql/README.md similarity index 100% rename from umami/README.md rename to umami-mysql/README.md diff --git a/umami/README_en.md b/umami-mysql/README_en.md similarity index 97% rename from umami/README_en.md rename to umami-mysql/README_en.md index 60faa4e69..ae55202a7 100644 --- a/umami/README_en.md +++ b/umami-mysql/README_en.md @@ -1,22 +1,22 @@ -# Usage Instructions - -- Supported database versions: MySQL >= 5.7, PostgreSQL >= 12.14. -- Default username on first login: admin, password: umami. - -# Umami - -*Umami* is a simple, fast, privacy-focused alternative to Google Analytics. - -## Main Features: - -- **Real-Time Data Monitoring**: Provides real-time website visit data, including visitor count and page views. -- **Traffic Source Tracking**: Analyzes and displays the sources of website traffic, including search engines and referral websites. -- **Geolocation Analysis**: Shows the geographical distribution of visitors, helping to understand user location. -- **Key Metrics Tracking**: Provides key metrics such as session duration and page dwell time to help optimize user experience and website content. - -## Advantages: - -- **Open Source and Free**: Umami is an open-source project, free to use and customize. -- **User-Friendly**: Simple and intuitive interface, easy to use and navigate. -- **Privacy Protection**: Emphasizes user data privacy and compliance considerations. - +# Usage Instructions + +- Supported database versions: MySQL >= 5.7, PostgreSQL >= 12.14. +- Default username on first login: admin, password: umami. + +# Umami + +*Umami* is a simple, fast, privacy-focused alternative to Google Analytics. + +## Main Features: + +- **Real-Time Data Monitoring**: Provides real-time website visit data, including visitor count and page views. +- **Traffic Source Tracking**: Analyzes and displays the sources of website traffic, including search engines and referral websites. +- **Geolocation Analysis**: Shows the geographical distribution of visitors, helping to understand user location. +- **Key Metrics Tracking**: Provides key metrics such as session duration and page dwell time to help optimize user experience and website content. + +## Advantages: + +- **Open Source and Free**: Umami is an open-source project, free to use and customize. +- **User-Friendly**: Simple and intuitive interface, easy to use and navigate. +- **Privacy Protection**: Emphasizes user data privacy and compliance considerations. + diff --git a/umami/data.yml b/umami-mysql/data.yml similarity index 97% rename from umami/data.yml rename to umami-mysql/data.yml index 480290dae..3225d57da 100644 --- a/umami/data.yml +++ b/umami-mysql/data.yml @@ -1,4 +1,4 @@ -name: Umami +name: Umami-mysql tags: - 实用工具 title: Google Analytics 的简单、快速、注重隐私的替代方案 diff --git a/umami-mysql/logo.png b/umami-mysql/logo.png new file mode 100644 index 000000000..84ac56492 Binary files /dev/null and b/umami-mysql/logo.png differ diff --git a/umami/logo.png b/umami/logo.png deleted file mode 100644 index abc842c39..000000000 Binary files a/umami/logo.png and /dev/null differ