diff --git a/.github/README.md b/.github/README.md index a5a4b324d..316cd83b3 100644 --- a/.github/README.md +++ b/.github/README.md @@ -123,6 +123,7 @@ | 🟢 | | Docker Mailserver | https://docker-mailserver.github.io/docker-mailserver/latest/ | 可用于生产的全栈但简单的邮件服务器 | | | 🟢 | | MaxKB | https://maxkb.cn/ | 基于 LLM 大语言模型的知识库问答系统 | | | 🟢 | | Media CMS | https://mediacms.io/ | 现代、功能齐全的开源视频和媒体内容管理系统 | | +| 🟢 | | MetaTube | https://github.com/metatube-community/ | 为 Jellyfin/Emby/Plex 开发的超级好用的成人元数据刮削插件 | | | 🟢 | | MinIO | https://min.io/ | MinIO 是一种高性能、兼容 S3 的对象存储 | | | 🟢 | | MoviePilot | https://github.com/jxxghp/MoviePilot/ | NAS媒体库自动化管理工具 | | | 🟢 | | MySQL | https://www.mysql.com/ | 关系数据库管理系统 | MySQL | @@ -155,7 +156,7 @@ | 🟢 | | Slink | https://github.com/andrii-kryvoviaz/slink/ | 图片分享平台 | | | 🟢 | | sonarr | https://sonarr.tv/ | 智能 PVR 适用于新闻组和 BT 用户。 | | | 🟢 | | SpeedTest | https://www.speedtest.net/ | 互联网速度测试 | | -| 🔴 | | SpeedTest-Tracker | https://docs.speedtest-tracker.dev/ | Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查 | | +| 🟢 | | SpeedTest-Tracker | https://docs.speedtest-tracker.dev/ | Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查 | | | 🟢 | | Stream-Rec | https://github.com/hua0512/stream-rec/ | Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | | 🟢 | | Stream-Rec Web版 | https://github.com/hua0512/stream-rec/ | 【前端版】Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | | 🟢 | | Stream-Rec 服务版 | https://github.com/hua0512/stream-rec/ | 【服务版】Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | diff --git a/README.md b/README.md index 491b56040..7633b725e 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ | 🟢 | | Docker Mailserver | https://docker-mailserver.github.io/docker-mailserver/latest/ | 可用于生产的全栈但简单的邮件服务器 | | | 🟢 | | MaxKB | https://maxkb.cn/ | 基于 LLM 大语言模型的知识库问答系统 | | | 🟢 | | Media CMS | https://mediacms.io/ | 现代、功能齐全的开源视频和媒体内容管理系统 | | +| 🟢 | | MetaTube | https://github.com/metatube-community/ | 为 Jellyfin/Emby/Plex 开发的超级好用的成人元数据刮削插件 | | | 🟢 | | MinIO | https://min.io/ | MinIO 是一种高性能、兼容 S3 的对象存储 | | | 🟢 | | MoviePilot | https://github.com/jxxghp/MoviePilot/ | NAS媒体库自动化管理工具 | | | 🟢 | | MySQL | https://www.mysql.com/ | 关系数据库管理系统 | MySQL | @@ -138,7 +139,7 @@ | 🟢 | | Slink | https://github.com/andrii-kryvoviaz/slink/ | 图片分享平台 | | | 🟢 | | sonarr | https://sonarr.tv/ | 智能 PVR 适用于新闻组和 BT 用户。 | | | 🟢 | | SpeedTest | https://www.speedtest.net/ | 互联网速度测试 | | -| 🔴 | | SpeedTest-Tracker | https://docs.speedtest-tracker.dev/ | Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查 | | +| 🟢 | | SpeedTest-Tracker | https://docs.speedtest-tracker.dev/ | Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查 | | | 🟢 | | Stream-Rec | https://github.com/hua0512/stream-rec/ | Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | | 🟢 | | Stream-Rec Web版 | https://github.com/hua0512/stream-rec/ | 【前端版】Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | | 🟢 | | Stream-Rec 服务版 | https://github.com/hua0512/stream-rec/ | 【服务版】Stream-rec是一个用于各种流媒体服务的自动流媒体录制工具 | | diff --git a/apps/acg-faka/1.3.8/docker-compose.yml b/apps/acg-faka/1.3.8/docker-compose.yml index 0906ac014..9c136e5df 100644 --- a/apps/acg-faka/1.3.8/docker-compose.yml +++ b/apps/acg-faka/1.3.8/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ACG_FAKA_ROOT_PATH}/data:/var/www/html diff --git a/apps/acg-faka/1.3.8/envs/default.env b/apps/acg-faka/1.3.8/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/acg-faka/1.3.8/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/acg-faka/1.3.8/envs/global.env b/apps/acg-faka/1.3.8/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/acg-faka/1.3.8/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/acg-faka/1.3.8/scripts/init.sh b/apps/acg-faka/1.3.8/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/acg-faka/1.3.8/scripts/init.sh +++ b/apps/acg-faka/1.3.8/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/acg-faka/1.3.8/scripts/upgrade.sh b/apps/acg-faka/1.3.8/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/acg-faka/1.3.8/scripts/upgrade.sh +++ b/apps/acg-faka/1.3.8/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/alist-aria2/3.40.0/docker-compose.yml b/apps/alist-aria2/3.40.0/docker-compose.yml index 1e03e01fd..c27227fa8 100644 --- a/apps/alist-aria2/3.40.0/docker-compose.yml +++ b/apps/alist-aria2/3.40.0/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5244 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ALIST_ROOT_PATH}/data:/opt/alist/data diff --git a/apps/alist-aria2/3.40.0/envs/default.env b/apps/alist-aria2/3.40.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/alist-aria2/3.40.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/alist-aria2/3.40.0/envs/global.env b/apps/alist-aria2/3.40.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/alist-aria2/3.40.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/alist-aria2/3.40.0/scripts/init.sh b/apps/alist-aria2/3.40.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/alist-aria2/3.40.0/scripts/init.sh +++ b/apps/alist-aria2/3.40.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/alist-aria2/3.40.0/scripts/upgrade.sh b/apps/alist-aria2/3.40.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/alist-aria2/3.40.0/scripts/upgrade.sh +++ b/apps/alist-aria2/3.40.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/alist-ffmpeg/3.40.0/docker-compose.yml b/apps/alist-ffmpeg/3.40.0/docker-compose.yml index 7c064af68..76fcfb8ca 100644 --- a/apps/alist-ffmpeg/3.40.0/docker-compose.yml +++ b/apps/alist-ffmpeg/3.40.0/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5244 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ALIST_ROOT_PATH}/data:/opt/alist/data diff --git a/apps/alist-ffmpeg/3.40.0/envs/default.env b/apps/alist-ffmpeg/3.40.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/alist-ffmpeg/3.40.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/alist-ffmpeg/3.40.0/envs/global.env b/apps/alist-ffmpeg/3.40.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/alist-ffmpeg/3.40.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/alist-ffmpeg/3.40.0/scripts/init.sh b/apps/alist-ffmpeg/3.40.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/alist-ffmpeg/3.40.0/scripts/init.sh +++ b/apps/alist-ffmpeg/3.40.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh b/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh +++ b/apps/alist-ffmpeg/3.40.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/alist/3.40.0/docker-compose.yml b/apps/alist/3.40.0/docker-compose.yml index 9f247544d..4e708409c 100644 --- a/apps/alist/3.40.0/docker-compose.yml +++ b/apps/alist/3.40.0/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5244 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ALIST_ROOT_PATH}/data:/opt/alist/data diff --git a/apps/alist/3.40.0/envs/default.env b/apps/alist/3.40.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/alist/3.40.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/alist/3.40.0/envs/global.env b/apps/alist/3.40.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/alist/3.40.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/alist/3.40.0/scripts/init.sh b/apps/alist/3.40.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/alist/3.40.0/scripts/init.sh +++ b/apps/alist/3.40.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/alist/3.40.0/scripts/upgrade.sh b/apps/alist/3.40.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/alist/3.40.0/scripts/upgrade.sh +++ b/apps/alist/3.40.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ani-rss/1.1.202/data.yml b/apps/ani-rss/1.1.202/data.yml index 57411f61d..1e348edcb 100644 --- a/apps/ani-rss/1.1.202/data.yml +++ b/apps/ani-rss/1.1.202/data.yml @@ -9,7 +9,7 @@ additionalProperties: type: text - default: 7789 edit: true - envKey: PANEL_APP_PORT_ADMIN + envKey: PANEL_APP_PORT_HTTP labelZh: WebUI 端口 labelEn: WebUI port required: true diff --git a/apps/ani-rss/1.1.202/docker-compose.yml b/apps/ani-rss/1.1.202/docker-compose.yml index 18956749d..acc595a83 100644 --- a/apps/ani-rss/1.1.202/docker-compose.yml +++ b/apps/ani-rss/1.1.202/docker-compose.yml @@ -12,9 +12,9 @@ services: networks: - 1panel-network ports: - - ${PANEL_APP_PORT_ADMIN}:7789 + - ${PANEL_APP_PORT_HTTP}:7789 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ANI_RSS_ROOT_PATH}/config:/config diff --git a/apps/ani-rss/1.1.202/envs/default.env b/apps/ani-rss/1.1.202/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/ani-rss/1.1.202/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/ani-rss/1.1.202/envs/global.env b/apps/ani-rss/1.1.202/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/ani-rss/1.1.202/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/ani-rss/1.1.202/scripts/init.sh b/apps/ani-rss/1.1.202/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/ani-rss/1.1.202/scripts/init.sh +++ b/apps/ani-rss/1.1.202/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ani-rss/1.1.202/scripts/upgrade.sh b/apps/ani-rss/1.1.202/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/ani-rss/1.1.202/scripts/upgrade.sh +++ b/apps/ani-rss/1.1.202/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ani-rss/README.md b/apps/ani-rss/README.md index b7f5eb97d..7d4495874 100644 --- a/apps/ani-rss/README.md +++ b/apps/ani-rss/README.md @@ -2,7 +2,7 @@ 自动追番、订阅、下载 蜜柑RSS动漫 -![Dockge](https://file.lifebus.top/imgs/ani_orss_cover.png) +![ANI-RSS](https://file.lifebus.top/imgs/ani_orss_cover.png) ![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) diff --git a/apps/artalk/2.9.1/docker-compose.yml b/apps/artalk/2.9.1/docker-compose.yml index 3662c36d2..65fc901b5 100644 --- a/apps/artalk/2.9.1/docker-compose.yml +++ b/apps/artalk/2.9.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:23366 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ARTALK_ROOT_PATH}/data:/data diff --git a/apps/artalk/2.9.1/envs/default.env b/apps/artalk/2.9.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/artalk/2.9.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/artalk/2.9.1/envs/global.env b/apps/artalk/2.9.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/artalk/2.9.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/artalk/2.9.1/scripts/init.sh b/apps/artalk/2.9.1/scripts/init.sh index 2b0096c5b..5e9dcca05 100644 --- a/apps/artalk/2.9.1/scripts/init.sh +++ b/apps/artalk/2.9.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env DATA_DIR="$ARTALK_ROOT_PATH/data" diff --git a/apps/artalk/2.9.1/scripts/upgrade.sh b/apps/artalk/2.9.1/scripts/upgrade.sh index 2b0096c5b..5e9dcca05 100644 --- a/apps/artalk/2.9.1/scripts/upgrade.sh +++ b/apps/artalk/2.9.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env DATA_DIR="$ARTALK_ROOT_PATH/data" diff --git a/apps/auto-lady/1.1.202/data.yml b/apps/auto-lady/1.1.202/data.yml index b39ee700f..668b067c0 100644 --- a/apps/auto-lady/1.1.202/data.yml +++ b/apps/auto-lady/1.1.202/data.yml @@ -9,7 +9,7 @@ additionalProperties: type: text - default: 8080 edit: true - envKey: PANEL_APP_PORT_ADMIN + envKey: PANEL_APP_PORT_HTTP labelZh: WebUI 端口 labelEn: WebUI port required: true diff --git a/apps/auto-lady/1.1.202/docker-compose.yml b/apps/auto-lady/1.1.202/docker-compose.yml index 825d9937b..54016fad6 100644 --- a/apps/auto-lady/1.1.202/docker-compose.yml +++ b/apps/auto-lady/1.1.202/docker-compose.yml @@ -12,9 +12,9 @@ services: networks: - 1panel-network ports: - - ${PANEL_APP_PORT_ADMIN}:80 + - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${AUTO_LADY_ROOT_PATH}/config:/data diff --git a/apps/auto-lady/1.1.202/envs/default.env b/apps/auto-lady/1.1.202/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/auto-lady/1.1.202/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/auto-lady/1.1.202/envs/global.env b/apps/auto-lady/1.1.202/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/auto-lady/1.1.202/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/auto-lady/1.1.202/scripts/init.sh b/apps/auto-lady/1.1.202/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/auto-lady/1.1.202/scripts/init.sh +++ b/apps/auto-lady/1.1.202/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/auto-lady/1.1.202/scripts/upgrade.sh b/apps/auto-lady/1.1.202/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/auto-lady/1.1.202/scripts/upgrade.sh +++ b/apps/auto-lady/1.1.202/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/auto-lady/README.md b/apps/auto-lady/README.md index ba461b045..9f9b42551 100644 --- a/apps/auto-lady/README.md +++ b/apps/auto-lady/README.md @@ -2,7 +2,7 @@ 自动化订阅AV影片 -![Dockge](https://file.lifebus.top/imgs/autolady_cover.png) +![AutoLady](https://file.lifebus.top/imgs/autolady_cover.png) ![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) diff --git a/apps/baota/9.0/docker-compose.yml b/apps/baota/9.0/docker-compose.yml index ac9b19555..41405008a 100644 --- a/apps/baota/9.0/docker-compose.yml +++ b/apps/baota/9.0/docker-compose.yml @@ -19,7 +19,7 @@ services: - ${PANEL_APP_PORT_MYSQL}:3306 - ${PANEL_APP_PORT_PHPADMIN}:888 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BAOTA_ROOT_PATH}/wwwroot:/www/wwwroot diff --git a/apps/baota/9.0/envs/default.env b/apps/baota/9.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/baota/9.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/baota/9.0/envs/global.env b/apps/baota/9.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/baota/9.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/baota/9.0/scripts/init.sh b/apps/baota/9.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/baota/9.0/scripts/init.sh +++ b/apps/baota/9.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/baota/9.0/scripts/upgrade.sh b/apps/baota/9.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/baota/9.0/scripts/upgrade.sh +++ b/apps/baota/9.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/bark/2.1.5/docker-compose.yml b/apps/bark/2.1.5/docker-compose.yml index dee00ec1c..2621737ff 100644 --- a/apps/bark/2.1.5/docker-compose.yml +++ b/apps/bark/2.1.5/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BARK_ROOT_PATH}/data:/data diff --git a/apps/bark/2.1.5/envs/default.env b/apps/bark/2.1.5/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/bark/2.1.5/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/bark/2.1.5/envs/global.env b/apps/bark/2.1.5/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/bark/2.1.5/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/bark/2.1.5/scripts/init.sh b/apps/bark/2.1.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/bark/2.1.5/scripts/init.sh +++ b/apps/bark/2.1.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/bark/2.1.5/scripts/upgrade.sh b/apps/bark/2.1.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/bark/2.1.5/scripts/upgrade.sh +++ b/apps/bark/2.1.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/bitmagnet/0.9.5/docker-compose.yml b/apps/bitmagnet/0.9.5/docker-compose.yml index 3cddf4ae0..3da4583ed 100644 --- a/apps/bitmagnet/0.9.5/docker-compose.yml +++ b/apps/bitmagnet/0.9.5/docker-compose.yml @@ -19,7 +19,7 @@ services: - ${PANEL_APP_PORT_BT}:3334/tcp - ${PANEL_APP_PORT_BT}:3334/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${BITMAGNET_ROOT_PATH}/config:/root/.config/bitmagnet diff --git a/apps/bitmagnet/0.9.5/envs/default.env b/apps/bitmagnet/0.9.5/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/bitmagnet/0.9.5/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/bitmagnet/0.9.5/envs/global.env b/apps/bitmagnet/0.9.5/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/bitmagnet/0.9.5/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/bitmagnet/0.9.5/scripts/init.sh b/apps/bitmagnet/0.9.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/bitmagnet/0.9.5/scripts/init.sh +++ b/apps/bitmagnet/0.9.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/bitmagnet/0.9.5/scripts/upgrade.sh b/apps/bitmagnet/0.9.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/bitmagnet/0.9.5/scripts/upgrade.sh +++ b/apps/bitmagnet/0.9.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/casdoor/1.758.0/docker-compose.yml b/apps/casdoor/1.758.0/docker-compose.yml index 656ad3e5f..b60ed2b9d 100644 --- a/apps/casdoor/1.758.0/docker-compose.yml +++ b/apps/casdoor/1.758.0/docker-compose.yml @@ -14,8 +14,8 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8000 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/casdoor/casdoor.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/casdoor/casdoor.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CASDOOR_ROOT_PATH}/files:/files diff --git a/apps/casdoor/1.758.0/envs/casdoor.env b/apps/casdoor/1.758.0/envs/casdoor.env new file mode 100644 index 000000000..cb7db866a --- /dev/null +++ b/apps/casdoor/1.758.0/envs/casdoor.env @@ -0,0 +1,31 @@ +appname=casdoor +httpport=8000 +runmode=prod +copyrequestbody=true +driverName=mysql +dataSourceName= +dbName=casdoor +tableNamePrefix= +showSql=false +redisEndpoint= +defaultStorageProvider= +isCloudIntranet=false +authState=casdoor +socks5Proxy= +verificationCodeTimeout=10 +initScore=0 +logPostOnly=true +isUsernameLowered=false +origin= +originFrontend= +staticBaseUrl=https://cdn.casbin.org +isDemoMode=false +batchSize=100 +enableGzip=true +ldapServerPort=389 +radiusServerPort=1812 +radiusSecret=secret +quota={"organization": -1, "user": -1, "application": -1, "provider": -1} +logConfig={"filename": "logs/casdoor.log", "maxdays":99999, "perm":"0770"} +initDataFil="./init_data.json" +frontendBaseDi="../casdoor" diff --git a/apps/casdoor/1.758.0/envs/default.env b/apps/casdoor/1.758.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/casdoor/1.758.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/casdoor/1.758.0/envs/global.env b/apps/casdoor/1.758.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/casdoor/1.758.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/casdoor/1.758.0/scripts/init.sh b/apps/casdoor/1.758.0/scripts/init.sh index dea3fb17b..cbf317ef5 100644 --- a/apps/casdoor/1.758.0/scripts/init.sh +++ b/apps/casdoor/1.758.0/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/casdoor.env" >> .env if [ "$DB_TYPE" == "mysql" ]; then echo "dataSourceName=$DB_USER:$DB_PASSWD@tcp($DB_HOSTNAME:$DB_PORT)/" >> .env diff --git a/apps/casdoor/1.758.0/scripts/upgrade.sh b/apps/casdoor/1.758.0/scripts/upgrade.sh index 77b849120..e32cd1c69 100644 --- a/apps/casdoor/1.758.0/scripts/upgrade.sh +++ b/apps/casdoor/1.758.0/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/casdoor.env" >> .env echo "Check Finish." diff --git a/apps/certimate/0.2.21/docker-compose.yml b/apps/certimate/0.2.21/docker-compose.yml index 92e2ae1f8..0f5f56280 100644 --- a/apps/certimate/0.2.21/docker-compose.yml +++ b/apps/certimate/0.2.21/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8090 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${CERTIMATE_ROOT_PATH}/data:/app/pb_data diff --git a/apps/certimate/0.2.21/envs/default.env b/apps/certimate/0.2.21/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/certimate/0.2.21/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/certimate/0.2.21/envs/global.env b/apps/certimate/0.2.21/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/certimate/0.2.21/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/certimate/0.2.21/scripts/init.sh b/apps/certimate/0.2.21/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/certimate/0.2.21/scripts/init.sh +++ b/apps/certimate/0.2.21/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/certimate/0.2.21/scripts/upgrade.sh b/apps/certimate/0.2.21/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/certimate/0.2.21/scripts/upgrade.sh +++ b/apps/certimate/0.2.21/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/cookie-cloud/latest/docker-compose.yml b/apps/cookie-cloud/latest/docker-compose.yml index 60adfef91..18e45935b 100644 --- a/apps/cookie-cloud/latest/docker-compose.yml +++ b/apps/cookie-cloud/latest/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8088 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${COOKIECLOUD_ROOT_PATH}/data:/data/api/data diff --git a/apps/cookie-cloud/latest/envs/default.env b/apps/cookie-cloud/latest/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/cookie-cloud/latest/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/cookie-cloud/latest/envs/global.env b/apps/cookie-cloud/latest/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/cookie-cloud/latest/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/cookie-cloud/latest/scripts/init.sh b/apps/cookie-cloud/latest/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/cookie-cloud/latest/scripts/init.sh +++ b/apps/cookie-cloud/latest/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/cookie-cloud/latest/scripts/upgrade.sh b/apps/cookie-cloud/latest/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/cookie-cloud/latest/scripts/upgrade.sh +++ b/apps/cookie-cloud/latest/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/deeplx/0.9.8.3/docker-compose.yml b/apps/deeplx/0.9.8.3/docker-compose.yml index 537654614..9bb2f2fe1 100644 --- a/apps/deeplx/0.9.8.3/docker-compose.yml +++ b/apps/deeplx/0.9.8.3/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:1188 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - PORT=1188 diff --git a/apps/deeplx/0.9.8.3/envs/default.env b/apps/deeplx/0.9.8.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/deeplx/0.9.8.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/deeplx/0.9.8.3/envs/global.env b/apps/deeplx/0.9.8.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/deeplx/0.9.8.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/deeplx/0.9.8.3/scripts/init.sh b/apps/deeplx/0.9.8.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/deeplx/0.9.8.3/scripts/init.sh +++ b/apps/deeplx/0.9.8.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/deeplx/0.9.8.3/scripts/upgrade.sh b/apps/deeplx/0.9.8.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/deeplx/0.9.8.3/scripts/upgrade.sh +++ b/apps/deeplx/0.9.8.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dockge/1.4.2/docker-compose.yml b/apps/dockge/1.4.2/docker-compose.yml index 808d63181..aa93e4167 100644 --- a/apps/dockge/1.4.2/docker-compose.yml +++ b/apps/dockge/1.4.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DOCKGE_ROOT_PATH}/data:/app/data diff --git a/apps/dockge/1.4.2/envs/default.env b/apps/dockge/1.4.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/dockge/1.4.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/dockge/1.4.2/envs/global.env b/apps/dockge/1.4.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/dockge/1.4.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/dockge/1.4.2/scripts/init.sh b/apps/dockge/1.4.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dockge/1.4.2/scripts/init.sh +++ b/apps/dockge/1.4.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dockge/1.4.2/scripts/upgrade.sh b/apps/dockge/1.4.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dockge/1.4.2/scripts/upgrade.sh +++ b/apps/dockge/1.4.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dozzle/8.8.2/docker-compose.yml b/apps/dozzle/8.8.2/docker-compose.yml index 5cf7d2fc1..162714bea 100644 --- a/apps/dozzle/8.8.2/docker-compose.yml +++ b/apps/dozzle/8.8.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} healthcheck: test: [ "CMD", "/dozzle", "healthcheck" ] diff --git a/apps/dozzle/8.8.2/envs/default.env b/apps/dozzle/8.8.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/dozzle/8.8.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/dozzle/8.8.2/envs/global.env b/apps/dozzle/8.8.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/dozzle/8.8.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/dozzle/8.8.2/scripts/init.sh b/apps/dozzle/8.8.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dozzle/8.8.2/scripts/init.sh +++ b/apps/dozzle/8.8.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dozzle/8.8.2/scripts/upgrade.sh b/apps/dozzle/8.8.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dozzle/8.8.2/scripts/upgrade.sh +++ b/apps/dozzle/8.8.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dpanel-lite/1.2.6/data.yml b/apps/dpanel-lite/1.3.0/data.yml similarity index 100% rename from apps/dpanel-lite/1.2.6/data.yml rename to apps/dpanel-lite/1.3.0/data.yml diff --git a/apps/dpanel-lite/1.2.6/docker-compose.yml b/apps/dpanel-lite/1.3.0/docker-compose.yml similarity index 88% rename from apps/dpanel-lite/1.2.6/docker-compose.yml rename to apps/dpanel-lite/1.3.0/docker-compose.yml index d7bacf7ad..4d29177ba 100644 --- a/apps/dpanel-lite/1.2.6/docker-compose.yml +++ b/apps/dpanel-lite/1.3.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: dpanel: - image: dpanel/dpanel:1.2.6-lite + image: dpanel/dpanel:1.3.0-lite container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DPANEL_ROOT_PATH}/data:/dpanel diff --git a/apps/dpanel-lite/1.3.0/envs/default.env b/apps/dpanel-lite/1.3.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/dpanel-lite/1.3.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/dpanel-lite/1.3.0/envs/global.env b/apps/dpanel-lite/1.3.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/dpanel-lite/1.3.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/dpanel/1.2.6/scripts/init.sh b/apps/dpanel-lite/1.3.0/scripts/init.sh similarity index 70% rename from apps/dpanel/1.2.6/scripts/init.sh rename to apps/dpanel-lite/1.3.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dpanel/1.2.6/scripts/init.sh +++ b/apps/dpanel-lite/1.3.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dpanel-lite/1.2.6/scripts/uninstall.sh b/apps/dpanel-lite/1.3.0/scripts/uninstall.sh similarity index 100% rename from apps/dpanel-lite/1.2.6/scripts/uninstall.sh rename to apps/dpanel-lite/1.3.0/scripts/uninstall.sh diff --git a/apps/halo/2.20.9/scripts/upgrade.sh b/apps/dpanel-lite/1.3.0/scripts/upgrade.sh similarity index 70% rename from apps/halo/2.20.9/scripts/upgrade.sh rename to apps/dpanel-lite/1.3.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/halo/2.20.9/scripts/upgrade.sh +++ b/apps/dpanel-lite/1.3.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dpanel/1.2.6/data.yml b/apps/dpanel/1.3.0/data.yml similarity index 100% rename from apps/dpanel/1.2.6/data.yml rename to apps/dpanel/1.3.0/data.yml diff --git a/apps/dpanel/1.2.6/docker-compose.yml b/apps/dpanel/1.3.0/docker-compose.yml similarity index 90% rename from apps/dpanel/1.2.6/docker-compose.yml rename to apps/dpanel/1.3.0/docker-compose.yml index 7cc17d1a3..0130472be 100644 --- a/apps/dpanel/1.2.6/docker-compose.yml +++ b/apps/dpanel/1.3.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: dpanel: - image: dpanel/dpanel:1.2.6 + image: dpanel/dpanel:1.3.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_HTTPS}:443 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DPANEL_ROOT_PATH}/data:/dpanel diff --git a/apps/dpanel/1.3.0/envs/default.env b/apps/dpanel/1.3.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/dpanel/1.3.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/dpanel/1.3.0/envs/global.env b/apps/dpanel/1.3.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/dpanel/1.3.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/dpanel-lite/1.2.6/scripts/init.sh b/apps/dpanel/1.3.0/scripts/init.sh similarity index 70% rename from apps/dpanel-lite/1.2.6/scripts/init.sh rename to apps/dpanel/1.3.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dpanel-lite/1.2.6/scripts/init.sh +++ b/apps/dpanel/1.3.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dpanel/1.2.6/scripts/uninstall.sh b/apps/dpanel/1.3.0/scripts/uninstall.sh similarity index 100% rename from apps/dpanel/1.2.6/scripts/uninstall.sh rename to apps/dpanel/1.3.0/scripts/uninstall.sh diff --git a/apps/nezha-dash/1.5.1/scripts/upgrade.sh b/apps/dpanel/1.3.0/scripts/upgrade.sh similarity index 70% rename from apps/nezha-dash/1.5.1/scripts/upgrade.sh rename to apps/dpanel/1.3.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nezha-dash/1.5.1/scripts/upgrade.sh +++ b/apps/dpanel/1.3.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dujiaoka/2.0.9/docker-compose.yml b/apps/dujiaoka/2.0.9/docker-compose.yml index 311ff6e07..410ccdfdc 100644 --- a/apps/dujiaoka/2.0.9/docker-compose.yml +++ b/apps/dujiaoka/2.0.9/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_API}:9000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${DUJIAOKA_ROOT_PATH}/app:/app diff --git a/apps/dujiaoka/2.0.9/envs/default.env b/apps/dujiaoka/2.0.9/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/dujiaoka/2.0.9/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/dujiaoka/2.0.9/envs/global.env b/apps/dujiaoka/2.0.9/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/dujiaoka/2.0.9/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/dujiaoka/2.0.9/scripts/init.sh b/apps/dujiaoka/2.0.9/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dujiaoka/2.0.9/scripts/init.sh +++ b/apps/dujiaoka/2.0.9/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/dujiaoka/2.0.9/scripts/upgrade.sh b/apps/dujiaoka/2.0.9/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dujiaoka/2.0.9/scripts/upgrade.sh +++ b/apps/dujiaoka/2.0.9/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/elastic-elasticsearch/8.16.1/docker-compose.yml b/apps/elastic-elasticsearch/8.16.1/docker-compose.yml index 90f1ab637..5382c4939 100644 --- a/apps/elastic-elasticsearch/8.16.1/docker-compose.yml +++ b/apps/elastic-elasticsearch/8.16.1/docker-compose.yml @@ -23,7 +23,7 @@ services: - ${PANEL_APP_PORT_HTTPS}:9200 - ${PANEL_APP_PORT_CLUSTER}:9300 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ELASTICSEARCH_ROOT_PATH}/data:/usr/share/elasticsearch/data diff --git a/apps/elastic-elasticsearch/8.16.1/envs/default.env b/apps/elastic-elasticsearch/8.16.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/elastic-elasticsearch/8.16.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/elastic-elasticsearch/8.16.1/envs/global.env b/apps/elastic-elasticsearch/8.16.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/elastic-elasticsearch/8.16.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/elastic-elasticsearch/8.16.1/scripts/init.sh b/apps/elastic-elasticsearch/8.16.1/scripts/init.sh index c5dbe2739..33a7b7f49 100644 --- a/apps/elastic-elasticsearch/8.16.1/scripts/init.sh +++ b/apps/elastic-elasticsearch/8.16.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p $ELASTICSEARCH_ROOT_PATH mkdir -p "$ELASTICSEARCH_ROOT_PATH/data" diff --git a/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh b/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh +++ b/apps/elastic-elasticsearch/8.16.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/elastic-kibana/8.16.1/docker-compose.yml b/apps/elastic-kibana/8.16.1/docker-compose.yml index 29f8b7a1c..161e09057 100644 --- a/apps/elastic-kibana/8.16.1/docker-compose.yml +++ b/apps/elastic-kibana/8.16.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5601 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${KIBANA_ROOT_PATH}/data:/usr/share/kibana/data diff --git a/apps/elastic-kibana/8.16.1/envs/default.env b/apps/elastic-kibana/8.16.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/elastic-kibana/8.16.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/elastic-kibana/8.16.1/envs/global.env b/apps/elastic-kibana/8.16.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/elastic-kibana/8.16.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/elastic-kibana/8.16.1/scripts/init.sh b/apps/elastic-kibana/8.16.1/scripts/init.sh index 98e49fa6f..f68fbe6d5 100644 --- a/apps/elastic-kibana/8.16.1/scripts/init.sh +++ b/apps/elastic-kibana/8.16.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p $KIBANA_ROOT_PATH mkdir -p "$KIBANA_ROOT_PATH/data" diff --git a/apps/elastic-kibana/8.16.1/scripts/upgrade.sh b/apps/elastic-kibana/8.16.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/elastic-kibana/8.16.1/scripts/upgrade.sh +++ b/apps/elastic-kibana/8.16.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/element-web/1.11.86/docker-compose.yml b/apps/element-web/1.11.86/docker-compose.yml index 5a7e24e0f..b6310049a 100644 --- a/apps/element-web/1.11.86/docker-compose.yml +++ b/apps/element-web/1.11.86/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ELEMENT_WEB_ROOT_PATH}/config/config.json:/app/config.json diff --git a/apps/element-web/1.11.86/envs/default.env b/apps/element-web/1.11.86/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/element-web/1.11.86/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/element-web/1.11.86/envs/global.env b/apps/element-web/1.11.86/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/element-web/1.11.86/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/element-web/1.11.86/scripts/init.sh b/apps/element-web/1.11.86/scripts/init.sh index cd438466c..65e20abfc 100644 --- a/apps/element-web/1.11.86/scripts/init.sh +++ b/apps/element-web/1.11.86/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env # setup-2 copy config file mkdir -p "$ELEMENT_WEB_ROOT_PATH" diff --git a/apps/element-web/1.11.86/scripts/upgrade.sh b/apps/element-web/1.11.86/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/element-web/1.11.86/scripts/upgrade.sh +++ b/apps/element-web/1.11.86/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/emby-amilys/4.8.9.0/envs/default.env b/apps/emby-amilys/4.8.9.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/emby-amilys/4.8.9.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/emby-amilys/4.8.9.0/envs/global.env b/apps/emby-amilys/4.8.9.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/emby-amilys/4.8.9.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/emby-amilys/4.8.9.0/scripts/init.sh b/apps/emby-amilys/4.8.9.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/emby-amilys/4.8.9.0/scripts/init.sh +++ b/apps/emby-amilys/4.8.9.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh b/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh +++ b/apps/emby-amilys/4.8.9.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/emby-lovechen/4.8.0.21/envs/default.env b/apps/emby-lovechen/4.8.0.21/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/emby-lovechen/4.8.0.21/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/emby-lovechen/4.8.0.21/envs/global.env b/apps/emby-lovechen/4.8.0.21/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/emby-lovechen/4.8.0.21/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/emby-lovechen/4.8.0.21/scripts/init.sh b/apps/emby-lovechen/4.8.0.21/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/emby-lovechen/4.8.0.21/scripts/init.sh +++ b/apps/emby-lovechen/4.8.0.21/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh b/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh +++ b/apps/emby-lovechen/4.8.0.21/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/emby/4.8.10.0/envs/default.env b/apps/emby/4.8.10.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/emby/4.8.10.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/emby/4.8.10.0/envs/global.env b/apps/emby/4.8.10.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/emby/4.8.10.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/emby/4.8.10.0/scripts/init.sh b/apps/emby/4.8.10.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/emby/4.8.10.0/scripts/init.sh +++ b/apps/emby/4.8.10.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/emby/4.8.10.0/scripts/upgrade.sh b/apps/emby/4.8.10.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/emby/4.8.10.0/scripts/upgrade.sh +++ b/apps/emby/4.8.10.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ghost/5.101.4/docker-compose.yml b/apps/ghost/5.101.4/docker-compose.yml index 0e5451911..74547852f 100644 --- a/apps/ghost/5.101.4/docker-compose.yml +++ b/apps/ghost/5.101.4/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2368 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GHOST_ROOT_PATH}/data:/var/lib/ghost/content diff --git a/apps/ghost/5.101.4/envs/default.env b/apps/ghost/5.101.4/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/ghost/5.101.4/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/ghost/5.101.4/envs/global.env b/apps/ghost/5.101.4/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/ghost/5.101.4/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/ghost/5.101.4/scripts/init.sh b/apps/ghost/5.101.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/ghost/5.101.4/scripts/init.sh +++ b/apps/ghost/5.101.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ghost/5.101.4/scripts/upgrade.sh b/apps/ghost/5.101.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/ghost/5.101.4/scripts/upgrade.sh +++ b/apps/ghost/5.101.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/gitea-runner/0.2.11/docker-compose.yml b/apps/gitea-runner/0.2.11/docker-compose.yml index d12055105..dcd12c17f 100644 --- a/apps/gitea-runner/0.2.11/docker-compose.yml +++ b/apps/gitea-runner/0.2.11/docker-compose.yml @@ -13,7 +13,7 @@ services: - 1panel-network privileged: true env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GITEA_RUNNER_ROOT_PATH}/data:/data diff --git a/apps/gitea-runner/0.2.11/envs/default.env b/apps/gitea-runner/0.2.11/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/gitea-runner/0.2.11/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/gitea-runner/0.2.11/envs/global.env b/apps/gitea-runner/0.2.11/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/gitea-runner/0.2.11/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/gitea/1.22.4/docker-compose.yml b/apps/gitea/1.22.4/docker-compose.yml index 33ba8c8fe..0cb3d4ede 100644 --- a/apps/gitea/1.22.4/docker-compose.yml +++ b/apps/gitea/1.22.4/docker-compose.yml @@ -15,8 +15,8 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_SSH}:22 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/gitea/gitea.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/gitea/gitea.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${GITEA_ROOT_PATH}/data:/data diff --git a/apps/gitea/1.22.4/envs/default.env b/apps/gitea/1.22.4/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/gitea/1.22.4/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/gitea/1.22.4/envs/gitea.env b/apps/gitea/1.22.4/envs/gitea.env new file mode 100644 index 000000000..1ead19442 --- /dev/null +++ b/apps/gitea/1.22.4/envs/gitea.env @@ -0,0 +1,36 @@ +USER_UID=1000 +USER_GID=1000 +APP_NAME="Gitea" +RUN_MODE=prod +DOMAIN=localhost +SSH_DOMAIN=localhost +SSH_PORT=22 +SSH_LISTEN_PORT=22 +DISABLE_SSH=false +HTTP_PORT=3000 +ROOT_URL="" +LFS_START_SERVER=true +DB_TYPE=sqlite3 +DB_HOST="" +DB_NAME="" +DB_USER="" +DB_PASSWD="" +INSTALL_LOCK=false +SECRET_KEY="" +DISABLE_REGISTRATION=false +REQUIRE_SIGNIN_VIEW=false +GITEA__time__DEFAULT_UI_LOCATION=Asia/Shanghai +GITEA__migrations__ALLOW_LOCALNETWORKS=true +GITEA__api__ENABLE_SWAGGER=false +GITEA__ui.meta__AUTHOR=新疆萌森软件开发工作室 +GITEA__ui.meta__DESCRIPTION=轻量级代码托管解决方案，支持自建和托管服务。 +GITEA__ui.meta__KEYWORDS=git,gitea,github,gitlab,gitee,code +GITEA__security__LOGIN_REMEMBER_DAYS=3 +GITEA__server__LOCAL_ROOT_URL=http://localhost:3000/ +GITEA__webhook__ALLOWED_HOST_LIST=* +GITEA__picture__REPOSITORY_AVATAR_FALLBACK=random +GITEA__attachment__MAX_SIZE=1024 +GITEA__git__MAX_GIT_DIFF_LINES=10000 +GITEA__git.config__http.postBuffer=2147483648 +GITEA__git.config__core.compression=0 +GITEA__other__SHOW_FOOTER_POWERED_BY=false diff --git a/apps/gitea/1.22.4/envs/global.env b/apps/gitea/1.22.4/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/gitea/1.22.4/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/gitea/1.22.4/scripts/init.sh b/apps/gitea/1.22.4/scripts/init.sh index 77b849120..636a62139 100644 --- a/apps/gitea/1.22.4/scripts/init.sh +++ b/apps/gitea/1.22.4/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/gitea.env" >> .env echo "Check Finish." diff --git a/apps/gitea/1.22.4/scripts/upgrade.sh b/apps/gitea/1.22.4/scripts/upgrade.sh index 77b849120..636a62139 100644 --- a/apps/gitea/1.22.4/scripts/upgrade.sh +++ b/apps/gitea/1.22.4/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/gitea.env" >> .env echo "Check Finish." diff --git a/apps/halo/2.20.9/data.yml b/apps/halo/2.20.10/data.yml similarity index 100% rename from apps/halo/2.20.9/data.yml rename to apps/halo/2.20.10/data.yml diff --git a/apps/halo/2.20.9/docker-compose.yml b/apps/halo/2.20.10/docker-compose.yml similarity index 95% rename from apps/halo/2.20.9/docker-compose.yml rename to apps/halo/2.20.10/docker-compose.yml index 92c2c4881..1cfddcaba 100644 --- a/apps/halo/2.20.9/docker-compose.yml +++ b/apps/halo/2.20.10/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: halo: - image: halohub/halo:2.20.9 + image: halohub/halo:2.20.10 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" diff --git a/apps/halo/2.20.10/envs/default.env b/apps/halo/2.20.10/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/halo/2.20.10/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/halo/2.20.10/envs/global.env b/apps/halo/2.20.10/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/halo/2.20.10/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/halo/2.20.9/scripts/init.sh b/apps/halo/2.20.10/scripts/init.sh similarity index 70% rename from apps/halo/2.20.9/scripts/init.sh rename to apps/halo/2.20.10/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/halo/2.20.9/scripts/init.sh +++ b/apps/halo/2.20.10/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/halo/2.20.9/scripts/uninstall.sh b/apps/halo/2.20.10/scripts/uninstall.sh similarity index 100% rename from apps/halo/2.20.9/scripts/uninstall.sh rename to apps/halo/2.20.10/scripts/uninstall.sh diff --git a/apps/dpanel-lite/1.2.6/scripts/upgrade.sh b/apps/halo/2.20.10/scripts/upgrade.sh similarity index 70% rename from apps/dpanel-lite/1.2.6/scripts/upgrade.sh rename to apps/halo/2.20.10/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dpanel-lite/1.2.6/scripts/upgrade.sh +++ b/apps/halo/2.20.10/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/iframely/2.4.3/docker-compose.yml b/apps/iframely/2.4.3/docker-compose.yml index 0a17e8913..520e6c521 100644 --- a/apps/iframely/2.4.3/docker-compose.yml +++ b/apps/iframely/2.4.3/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8061 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ./config/config.local.js:/iframely/config.local.js diff --git a/apps/iframely/2.4.3/envs/default.env b/apps/iframely/2.4.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/iframely/2.4.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/iframely/2.4.3/envs/global.env b/apps/iframely/2.4.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/iframely/2.4.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/iframely/2.4.3/scripts/init.sh b/apps/iframely/2.4.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/iframely/2.4.3/scripts/init.sh +++ b/apps/iframely/2.4.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/iframely/2.4.3/scripts/upgrade.sh b/apps/iframely/2.4.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/iframely/2.4.3/scripts/upgrade.sh +++ b/apps/iframely/2.4.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/immich-machine-learning/1.121.0/docker-compose.yml b/apps/immich-machine-learning/1.121.0/docker-compose.yml index 8ca588f45..69a8f942f 100644 --- a/apps/immich-machine-learning/1.121.0/docker-compose.yml +++ b/apps/immich-machine-learning/1.121.0/docker-compose.yml @@ -25,7 +25,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3003 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/apps/immich-machine-learning/1.121.0/envs/default.env b/apps/immich-machine-learning/1.121.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/immich-machine-learning/1.121.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/immich-machine-learning/1.121.0/envs/global.env b/apps/immich-machine-learning/1.121.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/immich-machine-learning/1.121.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/immich-machine-learning/1.121.0/scripts/init.sh b/apps/immich-machine-learning/1.121.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/immich-machine-learning/1.121.0/scripts/init.sh +++ b/apps/immich-machine-learning/1.121.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh b/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh +++ b/apps/immich-machine-learning/1.121.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/immich-server/1.121.0/docker-compose.yml b/apps/immich-server/1.121.0/docker-compose.yml index 3401114a5..0df36f0eb 100644 --- a/apps/immich-server/1.121.0/docker-compose.yml +++ b/apps/immich-server/1.121.0/docker-compose.yml @@ -25,7 +25,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2283 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload diff --git a/apps/immich-server/1.121.0/envs/default.env b/apps/immich-server/1.121.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/immich-server/1.121.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/immich-server/1.121.0/envs/global.env b/apps/immich-server/1.121.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/immich-server/1.121.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/immich-server/1.121.0/scripts/init.sh b/apps/immich-server/1.121.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/immich-server/1.121.0/scripts/init.sh +++ b/apps/immich-server/1.121.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/immich-server/1.121.0/scripts/upgrade.sh b/apps/immich-server/1.121.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/immich-server/1.121.0/scripts/upgrade.sh +++ b/apps/immich-server/1.121.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/immich/1.121.0/docker-compose.yml b/apps/immich/1.121.0/docker-compose.yml index a5f0f1a22..f6b81f43f 100644 --- a/apps/immich/1.121.0/docker-compose.yml +++ b/apps/immich/1.121.0/docker-compose.yml @@ -66,7 +66,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:2283 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/library:/usr/src/app/upload @@ -86,7 +86,7 @@ services: ports: - ${PANEL_APP_PORT_MACHINE_LEARNING}:3003 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IMMICH_ROOT_PATH}/data/cache:/cache diff --git a/apps/immich/1.121.0/envs/default.env b/apps/immich/1.121.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/immich/1.121.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/immich/1.121.0/envs/global.env b/apps/immich/1.121.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/immich/1.121.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/immich/1.121.0/scripts/init.sh b/apps/immich/1.121.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/immich/1.121.0/scripts/init.sh +++ b/apps/immich/1.121.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/immich/1.121.0/scripts/upgrade.sh b/apps/immich/1.121.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/immich/1.121.0/scripts/upgrade.sh +++ b/apps/immich/1.121.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/iycms/3.3.44/docker-compose.yml b/apps/iycms/3.3.44/docker-compose.yml index 6e11a743a..007b04d12 100644 --- a/apps/iycms/3.3.44/docker-compose.yml +++ b/apps/iycms/3.3.44/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_ADMIN}:21007 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${IYCMS_ROOT_PATH}/iycms:/app/iycms diff --git a/apps/iycms/3.3.44/envs/default.env b/apps/iycms/3.3.44/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/iycms/3.3.44/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/iycms/3.3.44/envs/global.env b/apps/iycms/3.3.44/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/iycms/3.3.44/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/iycms/3.3.44/scripts/init.sh b/apps/iycms/3.3.44/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/iycms/3.3.44/scripts/init.sh +++ b/apps/iycms/3.3.44/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/iycms/3.3.44/scripts/upgrade.sh b/apps/iycms/3.3.44/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/iycms/3.3.44/scripts/upgrade.sh +++ b/apps/iycms/3.3.44/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/iyuu-plus/latest/envs/default.env b/apps/iyuu-plus/latest/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/iyuu-plus/latest/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/iyuu-plus/latest/envs/global.env b/apps/iyuu-plus/latest/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/iyuu-plus/latest/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/jellyfin/10.10.3/envs/default.env b/apps/jellyfin/10.10.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/jellyfin/10.10.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/jellyfin/10.10.3/envs/global.env b/apps/jellyfin/10.10.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/jellyfin/10.10.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/jellyfin/10.9.11/envs/default.env b/apps/jellyfin/10.9.11/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/jellyfin/10.9.11/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/jellyfin/10.9.11/envs/global.env b/apps/jellyfin/10.9.11/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/jellyfin/10.9.11/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/jellyseerr/2.1.0/docker-compose.yml b/apps/jellyseerr/2.1.0/docker-compose.yml index b83a8a996..17eb649f0 100644 --- a/apps/jellyseerr/2.1.0/docker-compose.yml +++ b/apps/jellyseerr/2.1.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5055 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${JELLYSEERR_ROOT_PATH}/config:/app/config diff --git a/apps/jellyseerr/2.1.0/envs/default.env b/apps/jellyseerr/2.1.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/jellyseerr/2.1.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/jellyseerr/2.1.0/envs/global.env b/apps/jellyseerr/2.1.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/jellyseerr/2.1.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/jellyseerr/2.1.0/scripts/init.sh b/apps/jellyseerr/2.1.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/jellyseerr/2.1.0/scripts/init.sh +++ b/apps/jellyseerr/2.1.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/jellyseerr/2.1.0/scripts/upgrade.sh b/apps/jellyseerr/2.1.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/jellyseerr/2.1.0/scripts/upgrade.sh +++ b/apps/jellyseerr/2.1.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/jproxy/3.4.4/docker-compose.yml b/apps/jproxy/3.4.4/docker-compose.yml index ba2132000..0e57d2e61 100644 --- a/apps/jproxy/3.4.4/docker-compose.yml +++ b/apps/jproxy/3.4.4/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8117 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${JPROXY_ROOT_PATH}/data:/app/database diff --git a/apps/jproxy/3.4.4/envs/default.env b/apps/jproxy/3.4.4/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/jproxy/3.4.4/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/jproxy/3.4.4/envs/global.env b/apps/jproxy/3.4.4/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/jproxy/3.4.4/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/jproxy/3.4.4/scripts/init.sh b/apps/jproxy/3.4.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/jproxy/3.4.4/scripts/init.sh +++ b/apps/jproxy/3.4.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/jproxy/3.4.4/scripts/upgrade.sh b/apps/jproxy/3.4.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/jproxy/3.4.4/scripts/upgrade.sh +++ b/apps/jproxy/3.4.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/kimai/2.23.0/docker-compose.yml b/apps/kimai/2.23.0/docker-compose.yml index 0a46b5aac..5d7846b7a 100644 --- a/apps/kimai/2.23.0/docker-compose.yml +++ b/apps/kimai/2.23.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${KIMAI2_ROOT_PATH}/data:/opt/kimai/var/data diff --git a/apps/kimai/2.23.0/envs/default.env b/apps/kimai/2.23.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/kimai/2.23.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/kimai/2.23.0/envs/global.env b/apps/kimai/2.23.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/kimai/2.23.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/kimai/2.23.0/scripts/init.sh b/apps/kimai/2.23.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/kimai/2.23.0/scripts/init.sh +++ b/apps/kimai/2.23.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/kimai/2.23.0/scripts/upgrade.sh b/apps/kimai/2.23.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/kimai/2.23.0/scripts/upgrade.sh +++ b/apps/kimai/2.23.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/limesurvey/6.6.5/docker-compose.yml b/apps/limesurvey/6.6.5/docker-compose.yml index 0eb02680f..6bdeae63f 100644 --- a/apps/limesurvey/6.6.5/docker-compose.yml +++ b/apps/limesurvey/6.6.5/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${LIMESURVEY_ROOT_PATH}/surveys:/var/www/html/upload/surveys diff --git a/apps/limesurvey/6.6.5/envs/default.env b/apps/limesurvey/6.6.5/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/limesurvey/6.6.5/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/limesurvey/6.6.5/envs/global.env b/apps/limesurvey/6.6.5/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/limesurvey/6.6.5/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/limesurvey/6.6.5/scripts/init.sh b/apps/limesurvey/6.6.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/limesurvey/6.6.5/scripts/init.sh +++ b/apps/limesurvey/6.6.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/limesurvey/6.6.5/scripts/upgrade.sh b/apps/limesurvey/6.6.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/limesurvey/6.6.5/scripts/upgrade.sh +++ b/apps/limesurvey/6.6.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/linkding/1.36.0/docker-compose.yml b/apps/linkding/1.36.0/docker-compose.yml index 368e86b01..3dba9799d 100644 --- a/apps/linkding/1.36.0/docker-compose.yml +++ b/apps/linkding/1.36.0/docker-compose.yml @@ -19,7 +19,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:9090 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${LINKDING_ROOT_PATH}/data:/etc/linkding/data diff --git a/apps/linkding/1.36.0/envs/default.env b/apps/linkding/1.36.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/linkding/1.36.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/linkding/1.36.0/envs/global.env b/apps/linkding/1.36.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/linkding/1.36.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/linkding/1.36.0/scripts/init.sh b/apps/linkding/1.36.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/linkding/1.36.0/scripts/init.sh +++ b/apps/linkding/1.36.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/linkding/1.36.0/scripts/upgrade.sh b/apps/linkding/1.36.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/linkding/1.36.0/scripts/upgrade.sh +++ b/apps/linkding/1.36.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/maccms10/24.11.19/docker-compose.yml b/apps/maccms10/24.11.19/docker-compose.yml index cddca7952..d44f4c207 100644 --- a/apps/maccms10/24.11.19/docker-compose.yml +++ b/apps/maccms10/24.11.19/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MACCMS10_ROOT_PATH}/iycms:/app/iycms diff --git a/apps/maccms10/24.11.19/envs/default.env b/apps/maccms10/24.11.19/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/maccms10/24.11.19/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/maccms10/24.11.19/envs/global.env b/apps/maccms10/24.11.19/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/maccms10/24.11.19/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/maccms10/24.11.19/scripts/init.sh b/apps/maccms10/24.11.19/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/maccms10/24.11.19/scripts/init.sh +++ b/apps/maccms10/24.11.19/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/maccms10/24.11.19/scripts/upgrade.sh b/apps/maccms10/24.11.19/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/maccms10/24.11.19/scripts/upgrade.sh +++ b/apps/maccms10/24.11.19/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/macos/1.16/docker-compose.yml b/apps/macos/1.16/docker-compose.yml index c42bb681f..5a81d6bd1 100644 --- a/apps/macos/1.16/docker-compose.yml +++ b/apps/macos/1.16/docker-compose.yml @@ -29,7 +29,7 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MACOS_STORAGE_ROOT_PATH}/storage:/storage diff --git a/apps/macos/1.16/envs/default.env b/apps/macos/1.16/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/macos/1.16/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/macos/1.16/envs/global.env b/apps/macos/1.16/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/macos/1.16/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/macos/1.16/scripts/init.sh b/apps/macos/1.16/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/macos/1.16/scripts/init.sh +++ b/apps/macos/1.16/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/macos/1.16/scripts/upgrade.sh b/apps/macos/1.16/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/macos/1.16/scripts/upgrade.sh +++ b/apps/macos/1.16/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/mailserver/14.0.0/docker-compose.yml b/apps/mailserver/14.0.0/docker-compose.yml index d183ba062..e5dab842c 100644 --- a/apps/mailserver/14.0.0/docker-compose.yml +++ b/apps/mailserver/14.0.0/docker-compose.yml @@ -28,8 +28,8 @@ services: - ${PANEL_APP_PORT_POPS}:995 - ${PANEL_APP_PORT_MANAGESIEVE}:4190 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/mailserver/mailserver.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/mailserver/mailserver.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /etc/localtime:/etc/localtime:ro diff --git a/apps/mailserver/14.0.0/envs/default.env b/apps/mailserver/14.0.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/mailserver/14.0.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/mailserver/14.0.0/envs/global.env b/apps/mailserver/14.0.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/mailserver/14.0.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/mailserver/14.0.0/envs/mailserver.env b/apps/mailserver/14.0.0/envs/mailserver.env new file mode 100644 index 000000000..3db582043 --- /dev/null +++ b/apps/mailserver/14.0.0/envs/mailserver.env @@ -0,0 +1,661 @@ +# ----------------------------------------------- +# --- Mailserver Environment Variables ---------- +# ----------------------------------------------- + +# DOCUMENTATION FOR THESE VARIABLES IS FOUND UNDER +# https://docker-mailserver.github.io/docker-mailserver/latest/config/environment/ + +# ----------------------------------------------- +# --- General Section --------------------------- +# ----------------------------------------------- + +# empty => uses the `hostname` command to get the mail server's canonical hostname +# => Specify a fully-qualified domainname to serve mail for. This is used for many of the config features so if you can't set your hostname (e.g. you're in a container platform that doesn't let you) specify it in this environment variable. +OVERRIDE_HOSTNAME= + +# REMOVED in version v11.0.0! Use LOG_LEVEL instead. +DMS_DEBUG=0 + +# Set the log level for DMS. +# This is mostly relevant for container startup scripts and change detection event feedback. +# +# Valid values (in order of increasing verbosity) are: `error`, `warn`, `info`, `debug` and `trace`. +# The default log level is `info`. +LOG_LEVEL=info + +# critical => Only show critical messages +# error => Only show erroneous output +# **warn** => Show warnings +# info => Normal informational output +# debug => Also show debug messages +SUPERVISOR_LOGLEVEL= + +# Support for deployment where these defaults are not compatible (eg: some NAS appliances): +# /var/mail vmail User ID (default: 5000) +DMS_VMAIL_UID= +# /var/mail vmail Group ID (default: 5000) +DMS_VMAIL_GID= + +# **empty** => use FILE +# LDAP => use LDAP authentication +# OIDC => use OIDC authentication (not yet implemented) +# FILE => use local files (this is used as the default) +ACCOUNT_PROVISIONER= + +# empty => postmaster@domain.com +# => Specify the postmaster address +POSTMASTER_ADDRESS= + +# Check for updates on container start and then once a day +# If an update is available, a mail is sent to POSTMASTER_ADDRESS +# 0 => Update check disabled +# 1 => Update check enabled +ENABLE_UPDATE_CHECK=0 + +# Customize the update check interval. +# Number + Suffix. Suffix must be 's' for seconds, 'm' for minutes, 'h' for hours or 'd' for days. +UPDATE_CHECK_INTERVAL=1d + +# Set different options for mynetworks option (can be overwrite in postfix-main.cf) +# **WARNING**: Adding the docker network's gateway to the list of trusted hosts, e.g. using the `network` or +# `connected-networks` option, can create an open relay +# https://github.com/docker-mailserver/docker-mailserver/issues/1405#issuecomment-590106498 +# The same can happen for rootless podman. To prevent this, set the value to "none" or configure slirp4netns +# https://github.com/docker-mailserver/docker-mailserver/issues/2377 +# +# none => Explicitly force authentication +# container => Container IP address only +# host => Add docker container network (ipv4 only) +# network => Add all docker container networks (ipv4 only) +# connected-networks => Add all connected docker networks (ipv4 only) +PERMIT_DOCKER=none + +# Set the timezone. If this variable is unset, the container runtime will try to detect the time using +# `/etc/localtime`, which you can alternatively mount into the container. The value of this variable +# must follow the pattern `AREA/ZONE`, i.e. of you want to use Germany's time zone, use `Europe/Berlin`. +# You can lookup all available timezones here: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List +TZ=Asia/Shanghai + +# In case you network interface differs from 'eth0', e.g. when you are using HostNetworking in Kubernetes, +# you can set NETWORK_INTERFACE to whatever interface you want. This interface will then be used. +# - **empty** => eth0 +NETWORK_INTERFACE= + +# empty => modern +# modern => Enables TLSv1.2 and modern ciphers only. (default) +# intermediate => Enables TLSv1, TLSv1.1 and TLSv1.2 and broad compatibility ciphers. +TLS_LEVEL= + +# Configures the handling of creating mails with forged sender addresses. +# +# **0** => (not recommended) Mail address spoofing allowed. Any logged in user may create email messages with a forged sender address (see also https://en.wikipedia.org/wiki/Email_spoofing). +# 1 => Mail spoofing denied. Each user may only send with his own or his alias addresses. Addresses with extension delimiters(http://www.postfix.org/postconf.5.html#recipient_delimiter) are not able to send messages. +SPOOF_PROTECTION= + +# Enables the Sender Rewriting Scheme. SRS is needed if your mail server acts as forwarder. See [postsrsd](https://github.com/roehling/postsrsd/blob/master/README.md#sender-rewriting-scheme-crash-course) for further explanation. +# - **0** => Disabled +# - 1 => Enabled +ENABLE_SRS=0 + +# Enables the OpenDKIM service. +# **1** => Enabled +# 0 => Disabled +ENABLE_OPENDKIM=1 + +# Enables the OpenDMARC service. +# **1** => Enabled +# 0 => Disabled +ENABLE_OPENDMARC=1 + + +# Enabled `policyd-spf` in Postfix's configuration. You will likely want to set this +# to `0` in case you're using Rspamd (`ENABLE_RSPAMD=1`). +# +# - 0 => Disabled +# - **1** => Enabled +ENABLE_POLICYD_SPF=1 + +# Enables POP3 service +# - **0** => Disabled +# - 1 => Enabled +ENABLE_POP3= + +# Enables IMAP service +# - 0 => Disabled +# - **1** => Enabled +ENABLE_IMAP=1 + +# Enables ClamAV, and anti-virus scanner. +# 1 => Enabled +# **0** => Disabled +ENABLE_CLAMAV=0 + +# Add the value of this ENV as a prefix to the mail subject when spam is detected. +# NOTE: This subject prefix may be redundant (by default spam is delivered to a junk folder). +# It provides value when your junk mail is stored alongside legitimate mail instead of a separate location (like with `SPAMASSASSIN_SPAM_TO_INBOX=1` or `MOVE_SPAM_TO_JUNK=0` or a POP3 only setup, without IMAP). +# NOTE: When not using Docker Compose, other CRI may not support quote-wrapping the value here to preserve any trailing white-space. +SPAM_SUBJECT= + +# Enables Rspamd +# **0** => Disabled +# 1 => Enabled +ENABLE_RSPAMD=1 + +# When `ENABLE_RSPAMD=1`, an internal Redis instance is enabled implicitly. +# This setting provides an opt-out to allow using an external instance instead. +# 0 => Disabled +# 1 => Enabled +ENABLE_RSPAMD_REDIS= + +# When enabled, +# +# 1. the "[autolearning][rspamd-autolearn]" feature is turned on; +# 2. the Bayes classifier will be trained when moving mails from or to the Junk folder (with the help of Sieve scripts). +# +# **0** => disabled +# 1 => enabled +RSPAMD_LEARN=1 + +# This settings controls whether checks should be performed on emails coming +# from authenticated users (i.e. most likely outgoing emails). The default value +# is `0` in order to align better with SpamAssassin. We recommend reading +# through https://rspamd.com/doc/tutorials/scanning_outbound.html though to +# decide for yourself whether you need and want this feature. +# +# Note that DKIM signing of e-mails will still happen. +RSPAMD_CHECK_AUTHENTICATED=0 + +# Controls whether the Rspamd Greylisting module is enabled. +# This module can further assist in avoiding spam emails by greylisting +# e-mails with a certain spam score. +# +# **0** => disabled +# 1 => enabled +RSPAMD_GREYLISTING=1 + +# Can be used to enable or disable the Hfilter group module. +# +# - 0 => Disabled +# - **1** => Enabled +RSPAMD_HFILTER=1 + +# Can be used to control the score when the HFILTER_HOSTNAME_UNKNOWN symbol applies. A higher score is more punishing. Setting it to 15 is equivalent to rejecting the email when the check fails. +# +# Default: 6 +RSPAMD_HFILTER_HOSTNAME_UNKNOWN_SCORE=6 + +# Can be used to enable or disable the (still experimental) neural module. +# +# - **0** => Disabled +# - 1 => Enabled +RSPAMD_NEURAL=0 + +# Amavis content filter (used for ClamAV & SpamAssassin) +# 0 => Disabled +# 1 => Enabled +ENABLE_AMAVIS=0 + +# -1/-2/-3 => Only show errors +# **0** => Show warnings +# 1/2 => Show default informational output +# 3/4/5 => log debug information (very verbose) +AMAVIS_LOGLEVEL=0 + +# This enables DNS block lists in Postscreen. +# Note: Emails will be rejected, if they don't pass the block list checks! +# **0** => DNS block lists are disabled +# 1 => DNS block lists are enabled +ENABLE_DNSBL=0 + +# If you enable Fail2Ban, don't forget to add the following lines to your `compose.yaml`: +# cap_add: +# - NET_ADMIN +# Otherwise, `nftables` won't be able to ban IPs. +ENABLE_FAIL2BAN=0 + +# Fail2Ban blocktype +# drop => drop packet (send NO reply) +# reject => reject packet (send ICMP unreachable) +FAIL2BAN_BLOCKTYPE=drop + +# 1 => Enables Managesieve on port 4190 +# empty => disables Managesieve +ENABLE_MANAGESIEVE= + +# **enforce** => Allow other tests to complete. Reject attempts to deliver mail with a 550 SMTP reply, and log the helo/sender/recipient information. Repeat this test the next time the client connects. +# drop => Drop the connection immediately with a 521 SMTP reply. Repeat this test the next time the client connects. +# ignore => Ignore the failure of this test. Allow other tests to complete. Repeat this test the next time the client connects. This option is useful for testing and collecting statistics without blocking mail. +POSTSCREEN_ACTION=enforce + +# empty => all daemons start +# 1 => only launch postfix smtp +SMTP_ONLY= + +# Please read [the SSL page in the documentation](https://docker-mailserver.github.io/docker-mailserver/latest/config/security/ssl) for more information. +# +# empty => SSL disabled +# letsencrypt => Enables Let's Encrypt certificates +# custom => Enables custom certificates +# manual => Let's you manually specify locations of your SSL certificates for non-standard cases +# self-signed => Enables self-signed certificates +SSL_TYPE= + +# These are only supported with `SSL_TYPE=manual`. +# Provide the path to your cert and key files that you've mounted access to within the container. +SSL_CERT_PATH= +SSL_KEY_PATH= +# Optional: A 2nd certificate can be supported as fallback (dual cert support), eg ECDSA with an RSA fallback. +# Useful for additional compatibility with older MTA and MUA (eg pre-2015). +SSL_ALT_CERT_PATH= +SSL_ALT_KEY_PATH= + +# Set how many days a virusmail will stay on the server before being deleted +# empty => 7 days +VIRUSMAILS_DELETE_DELAY= + +# Configure Postfix `virtual_transport` to deliver mail to a different LMTP client (default is a dovecot socket). +# Provide any valid URI. Examples: +# +# empty => `lmtp:unix:/var/run/dovecot/lmtp` (default, configured in Postfix main.cf) +# `lmtp:unix:private/dovecot-lmtp` (use socket) +# `lmtps:inet::` (secure lmtp with starttls) +# `lmtp::2003` (use kopano as mailstore) +POSTFIX_DAGENT= + +# Set the mailbox size limit for all users. If set to zero, the size will be unlimited (default). Size is in bytes. +# +# empty => 0 +POSTFIX_MAILBOX_SIZE_LIMIT= + +# See https://docker-mailserver.github.io/docker-mailserver/latest/config/account-management/overview/#quotas +# 0 => Dovecot quota is disabled +# 1 => Dovecot quota is enabled +ENABLE_QUOTAS=1 + +# Set the message size limit for all users. If set to zero, the size will be unlimited (not recommended!). Size is in bytes. +# +# empty => 10240000 (~10 MB) +POSTFIX_MESSAGE_SIZE_LIMIT= + +# Mails larger than this limit won't be scanned. +# ClamAV must be enabled (ENABLE_CLAMAV=1) for this. +# +# empty => 25M (25 MB) +CLAMAV_MESSAGE_SIZE_LIMIT= + +# Enables regular pflogsumm mail reports. +# This is a new option. The old REPORT options are still supported for backwards compatibility. If this is not set and reports are enabled with the old options, logrotate will be used. +# +# not set => No report +# daily_cron => Daily report for the previous day +# logrotate => Full report based on the mail log when it is rotated +PFLOGSUMM_TRIGGER= + +# Recipient address for pflogsumm reports. +# +# not set => Use REPORT_RECIPIENT or POSTMASTER_ADDRESS +# => Specify the recipient address(es) +PFLOGSUMM_RECIPIENT= + +# Sender address (`FROM`) for pflogsumm reports if pflogsumm reports are enabled. +# +# not set => Use REPORT_SENDER +# => Specify the sender address +PFLOGSUMM_SENDER= + +# Interval for logwatch report. +# +# none => No report is generated +# daily => Send a daily report +# weekly => Send a report every week +LOGWATCH_INTERVAL= + +# Recipient address for logwatch reports if they are enabled. +# +# not set => Use REPORT_RECIPIENT or POSTMASTER_ADDRESS +# => Specify the recipient address(es) +LOGWATCH_RECIPIENT= + +# Sender address (`FROM`) for logwatch reports if logwatch reports are enabled. +# +# not set => Use REPORT_SENDER +# => Specify the sender address +LOGWATCH_SENDER= + +# Defines who receives reports if they are enabled. +# **empty** => ${POSTMASTER_ADDRESS} +# => Specify the recipient address +REPORT_RECIPIENT= + +# Defines who sends reports if they are enabled. +# **empty** => mailserver-report@${DOMAINNAME} +# => Specify the sender address +REPORT_SENDER= + +# Changes the interval in which log files are rotated +# **weekly** => Rotate log files weekly +# daily => Rotate log files daily +# monthly => Rotate log files monthly +# +# Note: This Variable actually controls logrotate inside the container +# and rotates the log files depending on this setting. The main log output is +# still available in its entirety via `docker logs mail` (Or your +# respective container name). If you want to control logrotation for +# the Docker-generated logfile see: +# https://docs.docker.com/config/containers/logging/configure/ +# +# Note: This variable can also determine the interval for Postfix's log summary reports, see [`PFLOGSUMM_TRIGGER`](#pflogsumm_trigger). +LOGROTATE_INTERVAL=weekly + +# Defines how many log files are kept by logrorate +LOGROTATE_COUNT=4 + + +# If enabled, employs `reject_unknown_client_hostname` to sender restrictions in Postfix's configuration. +# +# - **0** => Disabled +# - 1 => Enabled +POSTFIX_REJECT_UNKNOWN_CLIENT_HOSTNAME=0 + +# Choose TCP/IP protocols for postfix to use +# **all** => All possible protocols. +# ipv4 => Use only IPv4 traffic. Most likely you want this behind Docker. +# ipv6 => Use only IPv6 traffic. +# +# Note: More details at http://www.postfix.org/postconf.5.html#inet_protocols +POSTFIX_INET_PROTOCOLS=all + +# Enables MTA-STS support for outbound mail. +# More details: https://docker-mailserver.github.io/docker-mailserver/v13.3/config/best-practices/mta-sts/ +# - **0** ==> MTA-STS disabled +# - 1 => MTA-STS enabled +ENABLE_MTA_STS=0 + +# Choose TCP/IP protocols for dovecot to use +# **all** => Listen on all interfaces +# ipv4 => Listen only on IPv4 interfaces. Most likely you want this behind Docker. +# ipv6 => Listen only on IPv6 interfaces. +# +# Note: More information at https://dovecot.org/doc/dovecot-example.conf +DOVECOT_INET_PROTOCOLS=all + +# ----------------------------------------------- +# --- SpamAssassin Section ---------------------- +# ----------------------------------------------- + +ENABLE_SPAMASSASSIN=0 + +# KAM is a 3rd party SpamAssassin ruleset, provided by the McGrail Foundation. +# If SpamAssassin is enabled, KAM can be used in addition to the default ruleset. +# - **0** => KAM disabled +# - 1 => KAM enabled +# +# Note: only has an effect if `ENABLE_SPAMASSASSIN=1` +ENABLE_SPAMASSASSIN_KAM=1 + +# deliver spam messages to the inbox (tagged using SPAM_SUBJECT) +SPAMASSASSIN_SPAM_TO_INBOX=1 + +# spam messages will be moved in the Junk folder (SPAMASSASSIN_SPAM_TO_INBOX=1 required) +MOVE_SPAM_TO_JUNK=1 + +# spam messages will be marked as read +MARK_SPAM_AS_READ=1 + +# add 'spam info' headers at, or above this level +SA_TAG=2.0 + +# add 'spam detected' headers at, or above this level +SA_TAG2=6.31 + +# triggers spam evasive actions +SA_KILL=10.0 + +# ----------------------------------------------- +# --- Fetchmail Section ------------------------- +# ----------------------------------------------- + +ENABLE_FETCHMAIL=0 + +# The interval to fetch mail in seconds +FETCHMAIL_POLL=300 +# Use multiple fetchmail instances (1 per poll entry in fetchmail.cf) +# Supports multiple IMAP IDLE connections when a server is used across multiple poll entries +# https://otremba.net/wiki/Fetchmail_(Debian)#Immediate_Download_via_IMAP_IDLE +FETCHMAIL_PARALLEL=0 + +# Enable or disable `getmail`. +# +# - **0** => Disabled +# - 1 => Enabled +ENABLE_GETMAIL=0 + +# The number of minutes for the interval. Min: 1; Max: 30. +GETMAIL_POLL=5 + +# ----------------------------------------------- +# --- OAUTH2 Section ---------------------------- +# ----------------------------------------------- + +# empty => OAUTH2 authentication is disabled +# 1 => OAUTH2 authentication is enabled +ENABLE_OAUTH2= + +# Specify the user info endpoint URL of the oauth2 provider +# Example: https://oauth2.example.com/userinfo/ +OAUTH2_INTROSPECTION_URL= + +# ----------------------------------------------- +# --- LDAP Section ------------------------------ +# ----------------------------------------------- + +# A second container for the ldap service is necessary (i.e. https://hub.docker.com/r/bitnami/openldap/) + +# empty => no +# yes => LDAP over TLS enabled for Postfix +LDAP_START_TLS= + +# empty => mail.example.com +# Specify the `` / `` where the LDAP server is reachable via a URI like: `ldaps://mail.example.com`. +# Note: You must include the desired URI scheme (`ldap://`, `ldaps://`, `ldapi://`). +LDAP_SERVER_HOST= + +# empty => ou=people,dc=domain,dc=com +# => e.g. LDAP_SEARCH_BASE=dc=mydomain,dc=local +LDAP_SEARCH_BASE= + +# empty => cn=admin,dc=domain,dc=com +# => take a look at examples of SASL_LDAP_BIND_DN +LDAP_BIND_DN= + +# empty** => admin +# => Specify the password to bind against ldap +LDAP_BIND_PW= + +# e.g. `"(&(mail=%s)(mailEnabled=TRUE))"` +# => Specify how ldap should be asked for users +LDAP_QUERY_FILTER_USER= + +# e.g. `"(&(mailGroupMember=%s)(mailEnabled=TRUE))"` +# => Specify how ldap should be asked for groups +LDAP_QUERY_FILTER_GROUP= + +# e.g. `"(&(mailAlias=%s)(mailEnabled=TRUE))"` +# => Specify how ldap should be asked for aliases +LDAP_QUERY_FILTER_ALIAS= + +# e.g. `"(&(|(mail=*@%s)(mailalias=*@%s)(mailGroupMember=*@%s))(mailEnabled=TRUE))"` +# => Specify how ldap should be asked for domains +LDAP_QUERY_FILTER_DOMAIN= + +# ----------------------------------------------- +# --- Dovecot Section --------------------------- +# ----------------------------------------------- + +# empty => no +# yes => LDAP over TLS enabled for Dovecot +DOVECOT_TLS= + +# e.g. `"(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))"` +DOVECOT_USER_FILTER= + +# e.g. `"(&(objectClass=PostfixBookMailAccount)(uniqueIdentifier=%n))"` +DOVECOT_PASS_FILTER= + +# Define the mailbox format to be used +# default is maildir, supported values are: sdbox, mdbox, maildir +DOVECOT_MAILBOX_FORMAT=maildir + +# empty => no +# yes => Allow bind authentication for LDAP +# https://wiki.dovecot.org/AuthDatabase/LDAP/AuthBinds +DOVECOT_AUTH_BIND= + +# ----------------------------------------------- +# --- Postgrey Section -------------------------- +# ----------------------------------------------- + +ENABLE_POSTGREY=0 +# greylist for N seconds +POSTGREY_DELAY=300 +# delete entries older than N days since the last time that they have been seen +POSTGREY_MAX_AGE=35 +# response when a mail is greylisted +POSTGREY_TEXT="Delayed by Postgrey" +# whitelist host after N successful deliveries (N=0 to disable whitelisting) +POSTGREY_AUTO_WHITELIST_CLIENTS=5 + +# ----------------------------------------------- +# --- SASL Section ------------------------------ +# ----------------------------------------------- + +ENABLE_SASLAUTHD=0 + +# empty => pam +# `ldap` => authenticate against ldap server +# `shadow` => authenticate against local user db +# `mysql` => authenticate against mysql db +# `rimap` => authenticate against imap server +# Note: can be a list of mechanisms like pam ldap shadow +SASLAUTHD_MECHANISMS= + +# empty => None +# e.g. with SASLAUTHD_MECHANISMS rimap you need to specify the ip-address/servername of the imap server ==> xxx.xxx.xxx.xxx +SASLAUTHD_MECH_OPTIONS= + +# empty => Use value of LDAP_SERVER_HOST +# Note: You must include the desired URI scheme (`ldap://`, `ldaps://`, `ldapi://`). +SASLAUTHD_LDAP_SERVER= + +# empty => Use value of LDAP_BIND_DN +# specify an object with privileges to search the directory tree +# e.g. active directory: SASLAUTHD_LDAP_BIND_DN=cn=Administrator,cn=Users,dc=mydomain,dc=net +# e.g. openldap: SASLAUTHD_LDAP_BIND_DN=cn=admin,dc=mydomain,dc=net +SASLAUTHD_LDAP_BIND_DN= + +# empty => Use value of LDAP_BIND_PW +SASLAUTHD_LDAP_PASSWORD= + +# empty => Use value of LDAP_SEARCH_BASE +# specify the search base +SASLAUTHD_LDAP_SEARCH_BASE= + +# empty => default filter `(&(uniqueIdentifier=%u)(mailEnabled=TRUE))` +# e.g. for active directory: `(&(sAMAccountName=%U)(objectClass=person))` +# e.g. for openldap: `(&(uid=%U)(objectClass=person))` +SASLAUTHD_LDAP_FILTER= + +# empty => no +# yes => LDAP over TLS enabled for SASL +# If set to yes, the protocol in SASLAUTHD_LDAP_SERVER must be ldap:// or missing. +SASLAUTHD_LDAP_START_TLS= + +# empty => no +# yes => Require and verify server certificate +# If yes you must/could specify SASLAUTHD_LDAP_TLS_CACERT_FILE or SASLAUTHD_LDAP_TLS_CACERT_DIR. +SASLAUTHD_LDAP_TLS_CHECK_PEER= + +# File containing CA (Certificate Authority) certificate(s). +# empty => Nothing is added to the configuration +# Any value => Fills the `ldap_tls_cacert_file` option +SASLAUTHD_LDAP_TLS_CACERT_FILE= + +# Path to directory with CA (Certificate Authority) certificates. +# empty => Nothing is added to the configuration +# Any value => Fills the `ldap_tls_cacert_dir` option +SASLAUTHD_LDAP_TLS_CACERT_DIR= + +# Specify what password attribute to use for password verification. +# empty => Nothing is added to the configuration but the documentation says it is `userPassword` by default. +# Any value => Fills the `ldap_password_attr` option +SASLAUTHD_LDAP_PASSWORD_ATTR= + +# empty => `bind` will be used as a default value +# `fastbind` => The fastbind method is used +# `custom` => The custom method uses userPassword attribute to verify the password +SASLAUTHD_LDAP_AUTH_METHOD= + +# Specify the authentication mechanism for SASL bind +# empty => Nothing is added to the configuration +# Any value => Fills the `ldap_mech` option +SASLAUTHD_LDAP_MECH= + +# ----------------------------------------------- +# --- SRS Section ------------------------------- +# ----------------------------------------------- + +# envelope_sender => Rewrite only envelope sender address (default) +# header_sender => Rewrite only header sender (not recommended) +# envelope_sender,header_sender => Rewrite both senders +# An email has an "envelope" sender (indicating the sending server) and a +# "header" sender (indicating who sent it). More strict SPF policies may require +# you to replace both instead of just the envelope sender. +SRS_SENDER_CLASSES=envelope_sender + +# empty => Envelope sender will be rewritten for all domains +# provide comma separated list of domains to exclude from rewriting +SRS_EXCLUDE_DOMAINS= + +# empty => generated when the image is built +# provide a secret to use in base64 +# you may specify multiple keys, comma separated. the first one is used for +# signing and the remaining will be used for verification. this is how you +# rotate and expire keys +SRS_SECRET= + +# ----------------------------------------------- +# --- Default Relay Host Section ---------------- +# ----------------------------------------------- + +# Setup relaying all mail through a default relay host +# +# Set a default host to relay all mail through (optionally include a port) +# Example: [mail.example.com]:587 +DEFAULT_RELAY_HOST= + +# ----------------------------------------------- +# --- Multi-Domain Relay Section ---------------- +# ----------------------------------------------- + +# Setup relaying for multiple domains based on the domain name of the sender +# optionally uses usernames and passwords in postfix-sasl-password.cf and relay host mappings in postfix-relaymap.cf +# +# Set a default host to relay mail through +# Example: mail.example.com +RELAY_HOST= + +# empty => 25 +# default port to relay mail +RELAY_PORT=25 + +# ----------------------------------------------- +# --- Relay Host Credentials Section ------------ +# ----------------------------------------------- + +# Configure a relay user and password to use with RELAY_HOST / DEFAULT_RELAY_HOST + +# empty => no default +RELAY_USER= + +# empty => no default +RELAY_PASSWORD= diff --git a/apps/mailserver/14.0.0/scripts/init.sh b/apps/mailserver/14.0.0/scripts/init.sh index 77b849120..07da049e6 100644 --- a/apps/mailserver/14.0.0/scripts/init.sh +++ b/apps/mailserver/14.0.0/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/mailserver.env" >> .env echo "Check Finish." diff --git a/apps/mailserver/14.0.0/scripts/upgrade.sh b/apps/mailserver/14.0.0/scripts/upgrade.sh index 77b849120..07da049e6 100644 --- a/apps/mailserver/14.0.0/scripts/upgrade.sh +++ b/apps/mailserver/14.0.0/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/mailserver.env" >> .env echo "Check Finish." diff --git a/apps/mariadb/11.6.2/docker-compose.yml b/apps/mariadb/11.6.2/docker-compose.yml index c98cbb944..6efcc9f8d 100644 --- a/apps/mariadb/11.6.2/docker-compose.yml +++ b/apps/mariadb/11.6.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MARIADB_ROOT_PATH}/data:/var/lib/mysql diff --git a/apps/mariadb/11.6.2/envs/default.env b/apps/mariadb/11.6.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/mariadb/11.6.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/mariadb/11.6.2/envs/global.env b/apps/mariadb/11.6.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/mariadb/11.6.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/mariadb/11.6.2/scripts/init.sh b/apps/mariadb/11.6.2/scripts/init.sh index fb017c6cd..4d148914f 100644 --- a/apps/mariadb/11.6.2/scripts/init.sh +++ b/apps/mariadb/11.6.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$MARIADB_ROOT_PATH" mkdir -p "$MARIADB_ROOT_PATH/config" diff --git a/apps/mariadb/11.6.2/scripts/upgrade.sh b/apps/mariadb/11.6.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mariadb/11.6.2/scripts/upgrade.sh +++ b/apps/mariadb/11.6.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/maxkb/1.7.2/docker-compose.yml b/apps/maxkb/1.7.2/docker-compose.yml index 49962edd2..d59086e5f 100644 --- a/apps/maxkb/1.7.2/docker-compose.yml +++ b/apps/maxkb/1.7.2/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MAXKB_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/maxkb/1.7.2/envs/default.env b/apps/maxkb/1.7.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/maxkb/1.7.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/maxkb/1.7.2/envs/global.env b/apps/maxkb/1.7.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/maxkb/1.7.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/maxkb/1.7.2/scripts/init.sh b/apps/maxkb/1.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/maxkb/1.7.2/scripts/init.sh +++ b/apps/maxkb/1.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/maxkb/1.7.2/scripts/upgrade.sh b/apps/maxkb/1.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/maxkb/1.7.2/scripts/upgrade.sh +++ b/apps/maxkb/1.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/mcy-shop/5.0.17/docker-compose.yml b/apps/mcy-shop/5.0.17/docker-compose.yml index f129d7e56..102d471ad 100644 --- a/apps/mcy-shop/5.0.17/docker-compose.yml +++ b/apps/mcy-shop/5.0.17/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MCY_SHOP_ROOT_PATH}/data:/var/www/html diff --git a/apps/mcy-shop/5.0.17/envs/default.env b/apps/mcy-shop/5.0.17/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/mcy-shop/5.0.17/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/mcy-shop/5.0.17/envs/global.env b/apps/mcy-shop/5.0.17/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/mcy-shop/5.0.17/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/mcy-shop/5.0.17/scripts/init.sh b/apps/mcy-shop/5.0.17/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mcy-shop/5.0.17/scripts/init.sh +++ b/apps/mcy-shop/5.0.17/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/mcy-shop/5.0.17/scripts/upgrade.sh b/apps/mcy-shop/5.0.17/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mcy-shop/5.0.17/scripts/upgrade.sh +++ b/apps/mcy-shop/5.0.17/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/mediacms/4.1.0/docker-compose.yml b/apps/mediacms/4.1.0/docker-compose.yml index cff4154f5..3c689fad6 100644 --- a/apps/mediacms/4.1.0/docker-compose.yml +++ b/apps/mediacms/4.1.0/docker-compose.yml @@ -7,7 +7,7 @@ services: image: qyg2297248353/mediacms:v4.1.0 container_name: migrations-${CONTAINER_NAME} env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls @@ -37,7 +37,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MEDIACMS_ROOT_PATH}/media_files/hls:/home/mediacms.io/mediacms/media_files/hls diff --git a/apps/mediacms/4.1.0/envs/default.env b/apps/mediacms/4.1.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/mediacms/4.1.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/mediacms/4.1.0/envs/global.env b/apps/mediacms/4.1.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/mediacms/4.1.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/mediacms/4.1.0/scripts/init.sh b/apps/mediacms/4.1.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mediacms/4.1.0/scripts/init.sh +++ b/apps/mediacms/4.1.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/mediacms/4.1.0/scripts/upgrade.sh b/apps/mediacms/4.1.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mediacms/4.1.0/scripts/upgrade.sh +++ b/apps/mediacms/4.1.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/metatube-server/1.2.8/data.yml b/apps/metatube-server/1.2.8/data.yml new file mode 100644 index 000000000..ca4f52002 --- /dev/null +++ b/apps/metatube-server/1.2.8/data.yml @@ -0,0 +1,91 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_POSTGRES_SERVICE + required: true + type: service + default: postgresql + envKey: PANEL_POSTGRES_TYPE + labelZh: Postgres 服务 (前置检查) + labelEn: Postgres Service (Pre-check) + required: true + type: apps + values: + - label: PostgreSQL + value: postgresql + - default: "/home/metatube" + edit: true + envKey: METATUBE_ROOT_PATH + labelZh: 数据持久化路径 + labelEn: Data persistence path + required: true + type: text + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: WebUI 端口 + labelEn: WebUI port + required: true + rule: paramPort + type: number + - default: "" + edit: true + envKey: TOKEN + labelZh: 访问令牌 + labelEn: Access Token + required: true + type: password + - default: "127.0.0.1" + edit: true + envKey: POSTGRES_HOST + labelZh: 数据库 主机地址 + labelEn: Database Host + required: true + type: text + - default: 5432 + edit: true + envKey: POSTGRES_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: true + rule: paramPort + type: number + - default: "metatube" + edit: true + envKey: POSTGRES_NAME + labelZh: 数据库 名称 + labelEn: Database Name + required: true + rule: paramCommon + type: text + - default: "metatube" + edit: true + envKey: POSTGRES_USER + labelZh: 数据库 用户名 + labelEn: Database Username + required: true + type: text + - default: "" + edit: true + envKey: POSTGRES_PASSWORD + labelZh: 数据库 密码 + labelEn: Database Password + random: true + required: true + rule: paramComplexity + type: password + - default: "1m" + edit: true + envKey: REQUEST_TIMEOUT + labelZh: 请求超时时间 + labelEn: Request Timeout + required: true + type: text + - default: "" + edit: true + envKey: HTTP_PROXY + labelZh: 网络代理 (HTTP/Socket5) + labelEn: Network Proxy (HTTP/Socket5) + required: false + type: text diff --git a/apps/metatube-server/1.2.8/docker-compose.yml b/apps/metatube-server/1.2.8/docker-compose.yml new file mode 100644 index 000000000..7479d8bcf --- /dev/null +++ b/apps/metatube-server/1.2.8/docker-compose.yml @@ -0,0 +1,27 @@ +networks: + 1panel-network: + external: true + +services: + metatube-server: + image: metatube/metatube-server:1.2.8 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:8080 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${METATUBE_ROOT_PATH}/data:/var/run + environment: + - HTTPS_PROXY=${HTTP_PROXY} + - DB_MAX_IDLE_CONNS=0 + - DB_MAX_OPEN_CONNS=0 + - DB_PREPARED_STMT=false + - DB_AUTO_MIGRATE=true + command: -dsn "postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_NAME}" -port 8080 -db-auto-migrate -db-prepared-stmt diff --git a/apps/metatube-server/1.2.8/envs/default.env b/apps/metatube-server/1.2.8/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/metatube-server/1.2.8/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/metatube-server/1.2.8/envs/global.env b/apps/metatube-server/1.2.8/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/metatube-server/1.2.8/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nezha-dash/1.5.1/scripts/init.sh b/apps/metatube-server/1.2.8/scripts/init.sh similarity index 70% rename from apps/nezha-dash/1.5.1/scripts/init.sh rename to apps/metatube-server/1.2.8/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nezha-dash/1.5.1/scripts/init.sh +++ b/apps/metatube-server/1.2.8/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nezha-dash/1.5.1/scripts/uninstall.sh b/apps/metatube-server/1.2.8/scripts/uninstall.sh similarity index 100% rename from apps/nezha-dash/1.5.1/scripts/uninstall.sh rename to apps/metatube-server/1.2.8/scripts/uninstall.sh diff --git a/apps/dpanel/1.2.6/scripts/upgrade.sh b/apps/metatube-server/1.2.8/scripts/upgrade.sh similarity index 70% rename from apps/dpanel/1.2.6/scripts/upgrade.sh rename to apps/metatube-server/1.2.8/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/dpanel/1.2.6/scripts/upgrade.sh +++ b/apps/metatube-server/1.2.8/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/metatube-server/README.md b/apps/metatube-server/README.md new file mode 100644 index 000000000..cb5c78eb4 --- /dev/null +++ b/apps/metatube-server/README.md @@ -0,0 +1,87 @@ +# MetaTube 服务端 + +为 Jellyfin/Emby/Plex 开发的超级好用的元数据插件 + +![MetaTube](https://file.lifebus.top/imgs/metatube.png) + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 应用特性 + ++ 完整数据：包括标题、简介、演员、标签、评分等内容。 ++ 完整搜索：支持通过众多的刮削源搜索影片和演员信息。 ++ 预告功能：无需下载完整预告视频即可在线观看预告片。 ++ 计划任务：自动整理影片标签以及在后台自动更新插件。 ++ 人脸识别：内置的人脸识别以人脸为中心裁剪海报图像。 ++ 自动翻译：支持将特定的元数据内容翻译成需要的语言。 + +## 应用说明 + +该应用为 MetaTube 服务端，用于为 Jellyfin/Emby/Plex 提供元数据插件。 + +优先推荐部署在: 云服务器(美国/日本) + +如果您的网络环境不适合部署服务端，可以尝试配置网络代理。仅支持 HTTP 代理 / Socks5 代理。 + +## 插件安装 + +### Jellyfin + +1. 进入 Jellyfin 控制台 > 插件目录/存储库 > 设置，点击添加 +2. 输入存储库名称：MetaTube +3. 输入存储库 + +```url +# URL for GitHub +https://raw.githubusercontent.com/metatube-community/jellyfin-plugin-metatube/dist/manifest.json +``` + +4. 在插件目录下找到 MetaTube，点击安装 +5. 重启 Jellyfin + +> 适用于中国大陆的存储库 +> +> ```url +> # URL for jsDelivr +> https://cdn.jsdelivr.net/gh/metatube-community/jellyfin-plugin-metatube@dist/manifest.json +> ``` + +### Emby + +1. 从 Releases 下载 MetaTube 最新插件 +2. 解压出 MetaTube.dll 文件 +3. 将 dll 文件复制到 Emby 插件目录 +4. 重启 Emby 服务 + +> PS：Emby 后续插件更新由计划任务在后台自动完成。 + +### Plex + +1. 从 [GitHub](https://github.com/metatube-community/metatube-plex-plugins/archive/refs/heads/main.zip) + 或 [Releases](https://github.com/metatube-community/metatube-plex-plugins/releases) 下载最新的插件 + zip 文件 +2. 将解压后的 MetaTube.bundle 文件夹移入 Plex 插件目录的根目录 +3. 其中文件夹 MetaTubeHelper.bundle 为辅助插件，可选择性安装 +4. 重启 Plex 服务 + +### 常见 Emby 插件应用目录 + +#### 群晖 + +`/volume1/Emby/plugins` + +#### Windows + +`emby\programdata\plugins` + +#### Docker + +`<配置文件夹>/plugins` + +#### Linux（供参考） + +`/var/lib/emby-server/plugins/` + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/metatube-server/data.yml b/apps/metatube-server/data.yml new file mode 100644 index 000000000..b0d3691bc --- /dev/null +++ b/apps/metatube-server/data.yml @@ -0,0 +1,15 @@ +additionalProperties: + key: metatube-server + name: MetaTube + tags: + - WebSite + - Tool + - Local + shortDescZh: 为 Jellyfin/Emby/Plex 开发的超级好用的成人元数据刮削插件 + shortDescEn: A super easy-to-use adult metadata scraping plugin developed for Jellyfin/Emby/Plex + type: website + crossVersionUpdate: true + limit: 0 + website: https://github.com/metatube-community/ + github: https://github.com/metatube-community/ + document: https://metatube-community.github.io/ diff --git a/apps/metatube-server/logo.png b/apps/metatube-server/logo.png new file mode 100644 index 000000000..5671ce959 Binary files /dev/null and b/apps/metatube-server/logo.png differ diff --git a/apps/minio/2024-11-07/docker-compose.yml b/apps/minio/2024-11-07/docker-compose.yml index 5859c9bb0..a0ff7df1e 100644 --- a/apps/minio/2024-11-07/docker-compose.yml +++ b/apps/minio/2024-11-07/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_API}:${MINIO_API_PORT} command: server --console-address :${PANEL_APP_PORT_HTTP} --address :${MINIO_API_PORT} --json env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} extra_hosts: - ${MINIO_SERVER_HOST:-localhost}:127.0.0.1 diff --git a/apps/minio/2024-11-07/envs/default.env b/apps/minio/2024-11-07/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/minio/2024-11-07/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/minio/2024-11-07/envs/global.env b/apps/minio/2024-11-07/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/minio/2024-11-07/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/minio/2024-11-07/scripts/init.sh b/apps/minio/2024-11-07/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/minio/2024-11-07/scripts/init.sh +++ b/apps/minio/2024-11-07/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/minio/2024-11-07/scripts/upgrade.sh b/apps/minio/2024-11-07/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/minio/2024-11-07/scripts/upgrade.sh +++ b/apps/minio/2024-11-07/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/movie-pilot/1.9.17/docker-compose.yml b/apps/movie-pilot/1.9.17/docker-compose.yml index be5b28d4b..d4288e94a 100644 --- a/apps/movie-pilot/1.9.17/docker-compose.yml +++ b/apps/movie-pilot/1.9.17/docker-compose.yml @@ -15,8 +15,8 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_API}:3001 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/movie-pilot/movie-pilot.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/movie-pilot/movie-pilot.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/apps/movie-pilot/1.9.17/envs/default.env b/apps/movie-pilot/1.9.17/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/movie-pilot/1.9.17/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/movie-pilot/1.9.17/envs/global.env b/apps/movie-pilot/1.9.17/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/movie-pilot/1.9.17/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/movie-pilot/1.9.17/envs/movie-pilot.env b/apps/movie-pilot/1.9.17/envs/movie-pilot.env new file mode 100644 index 000000000..d244ac86f --- /dev/null +++ b/apps/movie-pilot/1.9.17/envs/movie-pilot.env @@ -0,0 +1,53 @@ +####################################################################### +# 【*】为必配项，其余为选配项，选配项可以删除整项配置项或者保留配置默认值 # +####################################################################### +# 【*】API监听地址（注意不是前端访问地址） +HOST=0.0.0.0 +# 是否调试模式，打开后将输出更多日志 +DEBUG=false +# 是否开发模式，打开后后台服务将不会启动 +DEV=false +# 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） +SUPERUSER=admin +# 大内存模式，开启后会增加缓存数量，但会占用更多内存 +BIG_MEMORY_MODE=false +# 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 +DOH_ENABLE=true +# 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 +META_CACHE_EXPIRE=0 +# 自动检查和更新站点资源包（索引、认证等） +AUTO_UPDATE_RESOURCE=true +# 【*】API密钥，建议更换复杂字符串，有Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API中使用 +API_TOKEN=moviepilot +# 登录页面电影海报，tmdb/bing，tmdb要求能正常连接api.themoviedb.org +WALLPAPER=tmdb +# TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` +TMDB_IMAGE_DOMAIN=image.tmdb.org +# TMDB API地址，无需修改需保留默认值，也可配置为`api.tmdb.org`或其它中转代理服务地址，能连通即可 +TMDB_API_DOMAIN=api.themoviedb.org +# 媒体识别来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时不支持二级分类 +RECOGNIZE_SOURCE=themoviedb +# Fanart开关 +FANART_ENABLE=true +# 新增已入库媒体是否跟随TMDB信息变化，true/false，为false时即使TMDB信息变化时也会仍然按历史记录中已入库的信息进行刮削 +SCRAP_FOLLOW_TMDB=true +# 刮削来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时会缺失部分信息 +SCRAP_SOURCE=themoviedb +# 电影重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ +MOVIE_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/{{title}}{% if year %} ({{year}}){% endif %}{% if part %}-{{part}}{% endif %}{% if videoFormat %} - {{videoFormat}}{% endif %}{{fileExt}} +# 电视剧重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ +TV_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/Season {{season}}/{{title}} - {{season_episode}}{% if part %}-{{part}}{% endif %}{% if episode %} - 第 {{episode}} 集{% endif %}{{fileExt}} +# 交互搜索自动下载用户ID（消息通知渠道的用户ID），使用,分割，设置为 all 代表所有用户自动择优下载，未设置需要用户手动选择资源或者回复`0`才自动择优下载 +AUTO_DOWNLOAD_USER= +# 自动下载站点字幕（如有） +DOWNLOAD_SUBTITLE=true +# OCR服务器地址 +OCR_HOST=https://movie-pilot.org +# 插件市场仓库地址，多个地址使用`,`分隔，保留最后的/ +PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins +# 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 +SEARCH_MULTIPLE_NAME=true + + +# 自定义配置 +AUTH_SITE="iyuu,hhclub,audiences,hddolby,zmpt,freefarm,hdfans,wintersakura,leaves,ptba,icc2022,xingtan,ptvicomo,agsvpt,hdkyl,qingwa,discfan,haidan,rousi" diff --git a/apps/movie-pilot/1.9.17/scripts/init.sh b/apps/movie-pilot/1.9.17/scripts/init.sh index 77b849120..118f924a3 100644 --- a/apps/movie-pilot/1.9.17/scripts/init.sh +++ b/apps/movie-pilot/1.9.17/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env echo "Check Finish." diff --git a/apps/movie-pilot/1.9.17/scripts/upgrade.sh b/apps/movie-pilot/1.9.17/scripts/upgrade.sh index 2df25115d..84793ac8a 100644 --- a/apps/movie-pilot/1.9.17/scripts/upgrade.sh +++ b/apps/movie-pilot/1.9.17/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env echo "Check Finish." else diff --git a/apps/movie-pilot/2.1.0/docker-compose.yml b/apps/movie-pilot/2.1.0/docker-compose.yml index 707c1c026..d3ce10b49 100644 --- a/apps/movie-pilot/2.1.0/docker-compose.yml +++ b/apps/movie-pilot/2.1.0/docker-compose.yml @@ -15,8 +15,8 @@ services: - ${PANEL_APP_PORT_HTTP}:3000 - ${PANEL_APP_PORT_API}:3001 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/movie-pilot/movie-pilot2.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/movie-pilot/movie-pilot2.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/apps/movie-pilot/2.1.0/envs/default.env b/apps/movie-pilot/2.1.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/movie-pilot/2.1.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/movie-pilot/2.1.0/envs/global.env b/apps/movie-pilot/2.1.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/movie-pilot/2.1.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/movie-pilot/2.1.0/envs/movie-pilot.env b/apps/movie-pilot/2.1.0/envs/movie-pilot.env new file mode 100644 index 000000000..78ba50bf1 --- /dev/null +++ b/apps/movie-pilot/2.1.0/envs/movie-pilot.env @@ -0,0 +1,63 @@ +####################################################################### +# 【*】为必配项，其余为选配项，选配项可以删除整项配置项或者保留配置默认值 # +####################################################################### +# 【*】API监听地址（注意不是前端访问地址） +HOST=0.0.0.0 +# 是否调试模式，打开后将输出更多日志 +DEBUG=false +# 是否开发模式，打开后后台服务将不会启动 +DEV=false +# 日志级别（DEBUG、INFO、WARNING、ERROR等），当DEBUG=true时，此配置项将被忽略，日志级别始终为DEBUG +LOG_LEVEL=INFO +# 数据库连接池的大小，可适当降低如20-50以减少I/O压力 +DB_POOL_SIZE=100 +# 数据库连接池最大溢出连接数，可适当降低如0以减少I/O压力 +DB_MAX_OVERFLOW=500 +# SQLite 的 busy_timeout 参数，可适当增加如180以减少锁定错误 +DB_TIMEOUT=60 +# 【*】超级管理员，设置后一但重启将固化到数据库中，修改将无效（初始化超级管理员密码仅会生成一次，请在日志中查看并自行登录系统修改） +SUPERUSER=admin +# 辅助认证，允许通过外部服务进行认证、单点登录以及自动创建用户 +AUXILIARY_AUTH_ENABLE=false +# 大内存模式，开启后会增加缓存数量，但会占用更多内存 +BIG_MEMORY_MODE=false +# 是否启用DOH域名解析，启用后对于api.themovie.org等域名通过DOH解析，避免域名DNS被污染 +DOH_ENABLE=true +# 使用 DOH 解析的域名列表，多个域名使用`,`分隔 +DOH_DOMAINS=api.themoviedb.org,api.tmdb.org,webservice.fanart.tv,api.github.com,github.com,raw.githubusercontent.com,api.telegram.org +# DOH 解析服务器列表，多个服务器使用`,`分隔 +DOH_RESOLVERS=1.0.0.1,1.1.1.1,9.9.9.9,149.112.112.112 +# 元数据识别缓存过期时间，数字型，单位小时，0为系统默认（大内存模式为7天，滞则为3天），调大该值可减少themoviedb的访问次数 +META_CACHE_EXPIRE=0 +# 自动检查和更新站点资源包（索引、认证等） +AUTO_UPDATE_RESOURCE=true +# 【*】API密钥，未设置时系统将随机生成，建议使用复杂字符串，用于Jellyseerr/Overseerr、媒体服务器Webhook等配置以及部分支持API_TOKEN的API请求 +API_TOKEN='' +# 登录页面电影海报，tmdb/bing/mediaserver，tmdb要求能正常连接api.themoviedb.org +WALLPAPER=tmdb +# TMDB图片地址，无需修改需保留默认值，如果默认地址连通性不好可以尝试修改为：`static-mdb.v.geilijiasu.com` +TMDB_IMAGE_DOMAIN=image.tmdb.org +# TMDB API地址，无需修改需保留默认值，也可配置为`api.tmdb.org`或其它中转代理服务地址，能连通即可 +TMDB_API_DOMAIN=api.themoviedb.org +# 媒体识别来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时不支持二级分类 +RECOGNIZE_SOURCE=themoviedb +# Fanart开关 +FANART_ENABLE=true +# 新增已入库媒体是否跟随TMDB信息变化，true/false，为false时即使TMDB信息变化时也会仍然按历史记录中已入库的信息进行刮削 +SCRAP_FOLLOW_TMDB=true +# 刮削来源 themoviedb/douban，使用themoviedb时需要确保能正常连接api.themoviedb.org，使用douban时会缺失部分信息 +SCRAP_SOURCE=themoviedb +# 电影重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ +MOVIE_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/{{title}}{% if year %} ({{year}}){% endif %}{% if part %}-{{part}}{% endif %}{% if videoFormat %} - {{videoFormat}}{% endif %}{{fileExt}} +# 电视剧重命名格式，Jinja2语法，参考：https://jinja.palletsprojects.com/en/3.0.x/templates/ +TV_RENAME_FORMAT={{title}}{% if year %} ({{year}}){% endif %}/Season {{season}}/{{title}} - {{season_episode}}{% if part %}-{{part}}{% endif %}{% if episode %} - 第 {{episode}} 集{% endif %}{{fileExt}} +# 交互搜索自动下载用户ID（消息通知渠道的用户ID），使用,分割，设置为 all 代表所有用户自动择优下载，未设置需要用户手动选择资源或者回复`0`才自动择优下载 +AUTO_DOWNLOAD_USER= +# 自动下载站点字幕（如有） +DOWNLOAD_SUBTITLE=true +# OCR服务器地址 +OCR_HOST=https://movie-pilot.org +# 插件市场仓库地址，多个地址使用`,`分隔，保留最后的/ +PLUGIN_MARKET=https://github.com/jxxghp/MoviePilot-Plugins,https://github.com/thsrite/MoviePilot-Plugins,https://github.com/InfinityPacer/MoviePilot-Plugins,https://github.com/honue/MoviePilot-Plugins +# 搜索多个名称，true/false，为true时搜索时会同时搜索中英文及原始名称，搜索结果会更全面，但会增加搜索时间；为false时其中一个名称搜索到结果或全部名称搜索完毕即停止 +SEARCH_MULTIPLE_NAME=true diff --git a/apps/movie-pilot/2.1.0/scripts/init.sh b/apps/movie-pilot/2.1.0/scripts/init.sh index 77b849120..118f924a3 100644 --- a/apps/movie-pilot/2.1.0/scripts/init.sh +++ b/apps/movie-pilot/2.1.0/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env echo "Check Finish." diff --git a/apps/movie-pilot/2.1.0/scripts/upgrade.sh b/apps/movie-pilot/2.1.0/scripts/upgrade.sh index 2df25115d..84793ac8a 100644 --- a/apps/movie-pilot/2.1.0/scripts/upgrade.sh +++ b/apps/movie-pilot/2.1.0/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/movie-pilot.env" >> .env echo "Check Finish." else diff --git a/apps/mysql/5.7.44/docker-compose.yml b/apps/mysql/5.7.44/docker-compose.yml index 6c767540b..7385b216d 100644 --- a/apps/mysql/5.7.44/docker-compose.yml +++ b/apps/mysql/5.7.44/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MYSQL_ROOT_PATH}/data/:/var/lib/mysql diff --git a/apps/mysql/5.7.44/envs/default.env b/apps/mysql/5.7.44/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/mysql/5.7.44/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/mysql/5.7.44/envs/global.env b/apps/mysql/5.7.44/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/mysql/5.7.44/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/mysql/5.7.44/scripts/init.sh b/apps/mysql/5.7.44/scripts/init.sh index 5a20b970f..1cdd90c20 100644 --- a/apps/mysql/5.7.44/scripts/init.sh +++ b/apps/mysql/5.7.44/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$MYSQL_ROOT_PATH" mkdir -p "$MYSQL_ROOT_PATH/config" diff --git a/apps/mysql/5.7.44/scripts/upgrade.sh b/apps/mysql/5.7.44/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mysql/5.7.44/scripts/upgrade.sh +++ b/apps/mysql/5.7.44/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/mysql/8.4.3/docker-compose.yml b/apps/mysql/8.4.3/docker-compose.yml index b991b12a4..af56485d2 100644 --- a/apps/mysql/8.4.3/docker-compose.yml +++ b/apps/mysql/8.4.3/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${MYSQL_ROOT_PATH}/data:/var/lib/mysql diff --git a/apps/mysql/8.4.3/envs/default.env b/apps/mysql/8.4.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/mysql/8.4.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/mysql/8.4.3/envs/global.env b/apps/mysql/8.4.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/mysql/8.4.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/mysql/8.4.3/scripts/init.sh b/apps/mysql/8.4.3/scripts/init.sh index 5a20b970f..1cdd90c20 100644 --- a/apps/mysql/8.4.3/scripts/init.sh +++ b/apps/mysql/8.4.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$MYSQL_ROOT_PATH" mkdir -p "$MYSQL_ROOT_PATH/config" diff --git a/apps/mysql/8.4.3/scripts/upgrade.sh b/apps/mysql/8.4.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/mysql/8.4.3/scripts/upgrade.sh +++ b/apps/mysql/8.4.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nacos/2.4.3/docker-compose.yml b/apps/nacos/2.4.3/docker-compose.yml index 262bf684a..f574f5873 100644 --- a/apps/nacos/2.4.3/docker-compose.yml +++ b/apps/nacos/2.4.3/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_GRPC_CLIENT}:9848 - ${PANEL_APP_PORT_GRPC_SERVER}:9849 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs diff --git a/apps/nacos/2.4.3/envs/default.env b/apps/nacos/2.4.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/nacos/2.4.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nacos/2.4.3/envs/global.env b/apps/nacos/2.4.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/nacos/2.4.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nacos/2.4.3/scripts/init.sh b/apps/nacos/2.4.3/scripts/init.sh index e13cf8c72..19193ac7b 100644 --- a/apps/nacos/2.4.3/scripts/init.sh +++ b/apps/nacos/2.4.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env if command -v mysql &> /dev/null; then if [[ -f ./init/mysql-schema.sql ]]; then diff --git a/apps/nacos/2.4.3/scripts/upgrade.sh b/apps/nacos/2.4.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nacos/2.4.3/scripts/upgrade.sh +++ b/apps/nacos/2.4.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nexusphp/1.8.16/docker-compose.yml b/apps/nexusphp/1.8.16/docker-compose.yml index 4648964b3..0a6fe9a58 100644 --- a/apps/nexusphp/1.8.16/docker-compose.yml +++ b/apps/nexusphp/1.8.16/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NEXUSPHP_ROOT_PATH}/config/.env.example:/var/www/html/.env.example diff --git a/apps/nexusphp/1.8.16/envs/default.env b/apps/nexusphp/1.8.16/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/nexusphp/1.8.16/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nexusphp/1.8.16/envs/global.env b/apps/nexusphp/1.8.16/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/nexusphp/1.8.16/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nexusphp/1.8.16/envs/nexusphp.env b/apps/nexusphp/1.8.16/envs/nexusphp.env new file mode 100644 index 000000000..9fe2c609a --- /dev/null +++ b/apps/nexusphp/1.8.16/envs/nexusphp.env @@ -0,0 +1,94 @@ +APP_NAME=NexusPHP +APP_ENV=local +APP_KEY=base64:WUbN2wa2kl3E1VDW4iKaH3RBHw3hKY7BK0hWEkBZmGg= +APP_DEBUG=true +APP_URL=http://localhost + +LOG_CHANNEL=stack +LOG_LEVEL=debug + +DB_CONNECTION=mysql +DB_HOST=127.0.0.1 +DB_PORT=3306 +DB_DATABASE=nexusphp +DB_USERNAME=root +DB_PASSWORD= + +BROADCAST_DRIVER=log +CACHE_DRIVER=redis +QUEUE_CONNECTION=redis +SESSION_DRIVER=file +SESSION_LIFETIME=120 + +MEMCACHED_HOST=127.0.0.1 + +MAIL_MAILER=smtp +MAIL_HOST=mailhog +MAIL_PORT=1025 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS=null +MAIL_FROM_NAME="${APP_NAME}" + +AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= +AWS_DEFAULT_REGION=us-east-1 +AWS_BUCKET= + +PUSHER_APP_ID= +PUSHER_APP_KEY= +PUSHER_APP_SECRET= +PUSHER_APP_CLUSTER=mt1 + +MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" +MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" + + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD= +REDIS_PORT=6379 +REDIS_DB=0 + +USE_CRON_TRIGGER_CLEANUP=true + +LOG_FILE=/tmp/nexus.log + +TIMEZONE=Asia/Shanghai + +GOOGLE_DRIVE_CLIENT_ID= +GOOGLE_DRIVE_CLIENT_SECRET= +GOOGLE_DRIVE_REFRESH_TOKEN= +GOOGLE_DRIVE_FOLDER_ID= + +GEOIP2_DATABASE=/var/www/html/geoip2/geoip2.mmdb + +ELASTICSEARCH_HOST= +ELASTICSEARCH_PORT= +ELASTICSEARCH_SCHEME= +ELASTICSEARCH_USER= +ELASTICSEARCH_PASS= +ELASTICSEARCH_SSL_VERIFICATION +ELASTICSEARCH_ENABLED= + +SFTP_HOST= +SFTP_USERNAME= +SFTP_PASSWORD= +SFTP_PORT= +SFTP_ROOT=/tmp + +UID_STARTS=10001 + +PHP_PATH= +NAS_TOOLS_KEY= +IYUU_SECRET= + +MEILISEARCH_SCHEME=http +MEILISEARCH_HOST=127.0.0.1 +MEILISEARCH_PORT=7700 +MEILISEARCH_MASTER_KEY= + +CACHE_KEY_AGENT_ALLOW=all_agent_allows +CACHE_KEY_AGENT_DENY=all_agent_denies +CHANNEL_NAME_SETTING=channel_setting +CHANNEL_NAME_MODEL_EVENT=channel_model_event diff --git a/apps/nexusphp/1.8.16/scripts/init.sh b/apps/nexusphp/1.8.16/scripts/init.sh index fc799a880..9a8966d38 100644 --- a/apps/nexusphp/1.8.16/scripts/init.sh +++ b/apps/nexusphp/1.8.16/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env # setup-2 download geoip2 GEOIP_DIR="$NEXUSPHP_ROOT_PATH/geoip2" @@ -24,7 +26,7 @@ if [ -f .env ]; then mkdir -p "$CONFIG_DIR" CONFIG_FILE="$CONFIG_DIR/.env.example" - cp /etc/1panel/envs/nexusphp/nexusphp.env $CONFIG_FILE + cp ./envs/nexusphp.env $CONFIG_FILE sed -i "s/APP_KEY=.*/APP_KEY=$APP_KEY/" $CONFIG_FILE echo "Check Finish." diff --git a/apps/nexusphp/1.8.16/scripts/upgrade.sh b/apps/nexusphp/1.8.16/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nexusphp/1.8.16/scripts/upgrade.sh +++ b/apps/nexusphp/1.8.16/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nezha-dash/1.5.1/data.yml b/apps/nezha-dash/1.5.4/data.yml similarity index 100% rename from apps/nezha-dash/1.5.1/data.yml rename to apps/nezha-dash/1.5.4/data.yml diff --git a/apps/nezha-dash/1.5.1/docker-compose.yml b/apps/nezha-dash/1.5.4/docker-compose.yml similarity index 89% rename from apps/nezha-dash/1.5.1/docker-compose.yml rename to apps/nezha-dash/1.5.4/docker-compose.yml index 2379a99f7..2a0713380 100644 --- a/apps/nezha-dash/1.5.1/docker-compose.yml +++ b/apps/nezha-dash/1.5.4/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: nezha-dash: - image: hamster1963/nezha-dash:v1.5.1 + image: hamster1963/nezha-dash:v1.5.4 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DefaultLocale=zh diff --git a/apps/nezha-dash/1.5.4/envs/default.env b/apps/nezha-dash/1.5.4/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/nezha-dash/1.5.4/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nezha-dash/1.5.4/envs/global.env b/apps/nezha-dash/1.5.4/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/nezha-dash/1.5.4/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nezha-dash/1.5.4/scripts/init.sh b/apps/nezha-dash/1.5.4/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/nezha-dash/1.5.4/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/pingvin-share/1.6.0/scripts/uninstall.sh b/apps/nezha-dash/1.5.4/scripts/uninstall.sh similarity index 100% rename from apps/pingvin-share/1.6.0/scripts/uninstall.sh rename to apps/nezha-dash/1.5.4/scripts/uninstall.sh diff --git a/apps/nezha-dash/1.5.4/scripts/upgrade.sh b/apps/nezha-dash/1.5.4/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/nezha-dash/1.5.4/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/nezha-dash/data.yml b/apps/nezha-dash/data.yml index 395e604c3..e9ef95b88 100644 --- a/apps/nezha-dash/data.yml +++ b/apps/nezha-dash/data.yml @@ -3,10 +3,11 @@ name: NezhaDash tags: - WebSite + - Middleware - Local shortDescZh: 基于 Next.js 和 哪吒监控 的仪表盘 shortDescEn: Dashboard based on Next.js and Nezha Monitor - type: tool + type: website crossVersionUpdate: true limit: 0 website: https://nezha-cf.buycoffee.top/ diff --git a/apps/nezha/0.20.13/envs/default.env b/apps/nezha/0.20.13/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/nezha/0.20.13/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nezha/0.20.13/envs/global.env b/apps/nezha/0.20.13/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/nezha/0.20.13/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nginx-ui/2.0.0/docker-compose.yml b/apps/nginx-ui/2.0.0/docker-compose.yml index a2966e1fd..3033ba22d 100644 --- a/apps/nginx-ui/2.0.0/docker-compose.yml +++ b/apps/nginx-ui/2.0.0/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:80 - ${PANEL_APP_PORT_HTTPS}:443 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NGINX_UI_ROOT_PATH}/nginx:/etc/nginx diff --git a/apps/nginx-ui/2.0.0/envs/default.env b/apps/nginx-ui/2.0.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/nginx-ui/2.0.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nginx-ui/2.0.0/envs/global.env b/apps/nginx-ui/2.0.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/nginx-ui/2.0.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nginx-ui/2.0.0/scripts/init.sh b/apps/nginx-ui/2.0.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nginx-ui/2.0.0/scripts/init.sh +++ b/apps/nginx-ui/2.0.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nginx-ui/2.0.0/scripts/upgrade.sh b/apps/nginx-ui/2.0.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nginx-ui/2.0.0/scripts/upgrade.sh +++ b/apps/nginx-ui/2.0.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nocodb/0.258.2/docker-compose.yml b/apps/nocodb/0.258.2/docker-compose.yml index dd6f0db7a..38a4491e8 100644 --- a/apps/nocodb/0.258.2/docker-compose.yml +++ b/apps/nocodb/0.258.2/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${NOCODB_ROOT_PATH}/data:/usr/app/data diff --git a/apps/nocodb/0.258.2/envs/default.env b/apps/nocodb/0.258.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/nocodb/0.258.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/nocodb/0.258.2/envs/global.env b/apps/nocodb/0.258.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/nocodb/0.258.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/nocodb/0.258.2/scripts/init.sh b/apps/nocodb/0.258.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nocodb/0.258.2/scripts/init.sh +++ b/apps/nocodb/0.258.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/nocodb/0.258.2/scripts/upgrade.sh b/apps/nocodb/0.258.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/nocodb/0.258.2/scripts/upgrade.sh +++ b/apps/nocodb/0.258.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/onedev/11.5.3/docker-compose.yml b/apps/onedev/11.5.3/docker-compose.yml index 4e496d6fd..0b2ee3877 100644 --- a/apps/onedev/11.5.3/docker-compose.yml +++ b/apps/onedev/11.5.3/docker-compose.yml @@ -18,8 +18,8 @@ services: - ${ONEDEV_ROOT_PATH}/data:/opt/onedev - /var/run/docker.sock:/var/run/docker.sock env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/onedev/onedev.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/onedev/onedev.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - initial_user=${INITIAL_USER} diff --git a/apps/onedev/11.5.3/envs/default.env b/apps/onedev/11.5.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/onedev/11.5.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/onedev/11.5.3/envs/global.env b/apps/onedev/11.5.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/onedev/11.5.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/onedev/11.5.3/envs/onedev.env b/apps/onedev/11.5.3/envs/onedev.env new file mode 100644 index 000000000..134c16ddc --- /dev/null +++ b/apps/onedev/11.5.3/envs/onedev.env @@ -0,0 +1,29 @@ +# 外部数据库支持配置 + +# PostgreSQL +# hibernate_dialect=io.onedev.server.persistence.PostgreSQLDialect +# hibernate_connection_driver_class=org.postgresql.Driver +# hibernate_connection_url=jdbc:postgresql://localhost:5432/onedev +# hibernate_connection_username=postgres +# hibernate_connection_password=postgres + +# MySQL +# hibernate_dialect=org.hibernate.dialect.MySQL5InnoDBDialect +# hibernate_connection_driver_class=com.mysql.cj.jdbc.Driver +# hibernate_connection_url=jdbc:mysql://localhost:3306/onedev?serverTimezone=UTC&allowPublicKeyRetrieval=true&useSSL=false&disableMariaDbDriver=true +# hibernate_connection_username=root +# hibernate_connection_password=root + +# MariaDB +# hibernate_dialect=org.hibernate.dialect.MySQL5InnoDBDialect +# hibernate_connection_driver_class=org.mariadb.jdbc.Driver +# hibernate_connection_url=jdbc:mariadb://localhost:3306/onedev +# hibernate_connection_username=root +# hibernate_connection_password=root + +# MS SQL Server +# hibernate_dialect=org.hibernate.dialect.SQLServer2012Dialect +# hibernate_connection_driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver +# hibernate_connection_url=jdbc:sqlserver://localhost:1433;databaseName=onedev +# hibernate_connection_username=sa +# hibernate_connection_password=sa diff --git a/apps/onedev/11.5.3/scripts/init.sh b/apps/onedev/11.5.3/scripts/init.sh index 77b849120..4232c6f85 100644 --- a/apps/onedev/11.5.3/scripts/init.sh +++ b/apps/onedev/11.5.3/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/onedev.env" >> .env echo "Check Finish." diff --git a/apps/onedev/11.5.3/scripts/upgrade.sh b/apps/onedev/11.5.3/scripts/upgrade.sh index 77b849120..4232c6f85 100644 --- a/apps/onedev/11.5.3/scripts/upgrade.sh +++ b/apps/onedev/11.5.3/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/onedev.env" >> .env echo "Check Finish." diff --git a/apps/openfire/4.9.0/docker-compose.yml b/apps/openfire/4.9.0/docker-compose.yml index 243e458b8..8a152afbd 100644 --- a/apps/openfire/4.9.0/docker-compose.yml +++ b/apps/openfire/4.9.0/docker-compose.yml @@ -17,7 +17,7 @@ services: - ${PANEL_APP_PORT_SERVER}:5222 - ${PANEL_APP_PORT_MESSAGE}:7777 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${OPENFIRE_ROOT_PATH}/data:/var/lib/openfire diff --git a/apps/openfire/4.9.0/envs/default.env b/apps/openfire/4.9.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/openfire/4.9.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/openfire/4.9.0/envs/global.env b/apps/openfire/4.9.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/openfire/4.9.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/openfire/4.9.0/scripts/init.sh b/apps/openfire/4.9.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/openfire/4.9.0/scripts/init.sh +++ b/apps/openfire/4.9.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/openfire/4.9.0/scripts/upgrade.sh b/apps/openfire/4.9.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/openfire/4.9.0/scripts/upgrade.sh +++ b/apps/openfire/4.9.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/outline/0.81.1/docker-compose.yml b/apps/outline/0.81.1/docker-compose.yml index 503ffda82..978e087f4 100644 --- a/apps/outline/0.81.1/docker-compose.yml +++ b/apps/outline/0.81.1/docker-compose.yml @@ -16,8 +16,8 @@ services: volumes: - ${OUTLINE_ROOT_PATH}/data:/var/lib/outline/data env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/outline/outline.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/outline/outline.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DATABASE_URL=postgres://${DB_USERNAME}:${DB_PASSWORD}@${DB_HOSTNAME}:${DB_PORT}/${DB_DATABASE_NAME} diff --git a/apps/outline/0.81.1/envs/default.env b/apps/outline/0.81.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/outline/0.81.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/outline/0.81.1/envs/global.env b/apps/outline/0.81.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/outline/0.81.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/outline/0.81.1/envs/outline.env b/apps/outline/0.81.1/envs/outline.env new file mode 100644 index 000000000..1e366c08f --- /dev/null +++ b/apps/outline/0.81.1/envs/outline.env @@ -0,0 +1,224 @@ +# –––––––––––––––– REQUIRED –––––––––––––––– + +NODE_ENV=production + +# Generate a hex-encoded 32-byte random key. You should use `openssl rand -hex 32` +# in your terminal to generate a random value. +SECRET_KEY=generate_a_new_key + +# Generate a unique random key. The format is not important but you could still use +# `openssl rand -hex 32` in your terminal to produce this. +UTILS_SECRET=generate_a_new_key + +# For production point these at your databases, in development the default +# should work out of the box. +DATABASE_URL=postgres://user:pass@localhost:5432/outline +DATABASE_CONNECTION_POOL_MIN= +DATABASE_CONNECTION_POOL_MAX= +# Uncomment this to disable SSL for connecting to Postgres +PGSSLMODE=disable + +# For redis you can either specify an ioredis compatible url like this +REDIS_URL=redis://localhost:6379 +# or alternatively, if you would like to provide additional connection options, +# use a base64 encoded JSON connection option object. Refer to the ioredis documentation +# for a list of available options. +# Example: Use Redis Sentinel for high availability +# {"sentinels":[{"host":"sentinel-0","port":26379},{"host":"sentinel-1","port":26379}],"name":"mymaster"} +# REDIS_URL=ioredis://eyJzZW50aW5lbHMiOlt7Imhvc3QiOiJzZW50aW5lbC0wIiwicG9ydCI6MjYzNzl9LHsiaG9zdCI6InNlbnRpbmVsLTEiLCJwb3J0IjoyNjM3OX1dLCJuYW1lIjoibXltYXN0ZXIifQ== + +# URL should point to the fully qualified, publicly accessible URL. If using a +# proxy the port in URL and PORT may be different. +URL=http://127.0.0.1:3000 +PORT=3000 + +# See [documentation](docs/SERVICES.md) on running a separate collaboration +# server, for normal operation this does not need to be set. +COLLABORATION_URL= + +# Specify what storage system to use. Possible value is one of "s3" or "local". +# For "local", the avatar images and document attachments will be saved on local disk. +FILE_STORAGE=local + +# If "local" is configured for FILE_STORAGE above, then this sets the parent directory under +# which all attachments/images go. Make sure that the process has permissions to create +# this path and also to write files to it. +FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data + +# Maximum allowed size for the uploaded attachment. +FILE_STORAGE_UPLOAD_MAX_SIZE=262144000 + +# Override the maximum size of document imports, generally this should be lower +# than the document attachment maximum size. +FILE_STORAGE_IMPORT_MAX_SIZE= + +# Override the maximum size of workspace imports, these can be especially large +# and the files are temporary being automatically deleted after a period of time. +FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE= + +# To support uploading of images for avatars and document attachments in a distributed +# architecture an s3-compatible storage can be configured if FILE_STORAGE=s3 above. +AWS_ACCESS_KEY_ID=get_a_key_from_aws +AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key +AWS_REGION=xx-xxxx-x +AWS_S3_ACCELERATE_URL= +AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 +AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here +AWS_S3_FORCE_PATH_STYLE=true +AWS_S3_ACL=private + +# –––––––––––––– AUTHENTICATION –––––––––––––– + +# Third party signin credentials, at least ONE OF EITHER Google, Slack, +# or Microsoft is required for a working installation or you'll have no sign-in +# options. + +# To configure Slack auth, you'll need to create an Application at +# => https://api.slack.com/apps +# +# When configuring the Client ID, add a redirect URL under "OAuth & Permissions": +# https:///auth/slack.callback +SLACK_CLIENT_ID=get_a_key_from_slack +SLACK_CLIENT_SECRET=get_the_secret_of_above_key + +# To configure Google auth, you'll need to create an OAuth Client ID at +# => https://console.cloud.google.com/apis/credentials +# +# When configuring the Client ID, add an Authorized redirect URI: +# https:///auth/google.callback +GOOGLE_CLIENT_ID= +GOOGLE_CLIENT_SECRET= + +# To configure Microsoft/Azure auth, you'll need to create an OAuth Client. See +# the guide for details on setting up your Azure App: +# => https://wiki.generaloutline.com/share/dfa77e56-d4d2-4b51-8ff8-84ea6608faa4 +AZURE_CLIENT_ID= +AZURE_CLIENT_SECRET= +AZURE_RESOURCE_APP_ID= + +# To configure generic OIDC auth, you'll need some kind of identity provider. +# See documentation for whichever IdP you use to acquire the following info: +# Redirect URI is https:///auth/oidc.callback +OIDC_CLIENT_ID= +OIDC_CLIENT_SECRET= +OIDC_AUTH_URI= +OIDC_TOKEN_URI= +OIDC_USERINFO_URI= +OIDC_LOGOUT_URI= + +# Specify which claims to derive user information from +# Supports any valid JSON path with the JWT payload +OIDC_USERNAME_CLAIM=preferred_username + +# Display name for OIDC authentication +OIDC_DISPLAY_NAME=OpenID Connect + +# Space separated auth scopes. +OIDC_SCOPES=openid profile email + +# To configure the GitHub integration, you'll need to create a GitHub App at +# => https://github.com/settings/apps +# +# When configuring the Client ID, add a redirect URL under "Permissions & events": +# https:///api/github.callback +GITHUB_CLIENT_ID= +GITHUB_CLIENT_SECRET= +GITHUB_APP_NAME= +GITHUB_APP_ID= +GITHUB_APP_PRIVATE_KEY= + +# To configure Discord auth, you'll need to create a Discord Application at +# => https://discord.com/developers/applications/ +# +# When configuring the Client ID, add a redirect URL under "OAuth2": +# https:///auth/discord.callback +DISCORD_CLIENT_ID= +DISCORD_CLIENT_SECRET= + +# DISCORD_SERVER_ID should be the ID of the Discord server that Outline is +# integrated with. +# Used to verify that the user is a member of the server as well as server +# metadata such as nicknames, server icon and name. +DISCORD_SERVER_ID= + +# DISCORD_SERVER_ROLES should be a comma separated list of role IDs that are +# allowed to access Outline. If this is not set, all members of the server +# will be allowed to access Outline. +# DISCORD_SERVER_ID and DISCORD_SERVER_ROLES must be set together. +DISCORD_SERVER_ROLES= + +# –––––––––––––––– OPTIONAL –––––––––––––––– + +# Base64 encoded private key and certificate for HTTPS termination. This is only +# required if you do not use an external reverse proxy. See documentation: +# https://wiki.generaloutline.com/share/1c922644-40d8-41fe-98f9-df2b67239d45 +SSL_KEY= +SSL_CERT= + +# If using a Cloudfront/Cloudflare distribution or similar it can be set below. +# This will cause paths to javascript, stylesheets, and images to be updated to +# the hostname defined in CDN_URL. In your CDN configuration the origin server +# should be set to the same as URL. +CDN_URL= + +# Auto-redirect to https in production. The default is true but you may set to +# false if you can be sure that SSL is terminated at an external loadbalancer. +FORCE_HTTPS=false + +# Have the installation check for updates by sending anonymized statistics to +# the maintainers +ENABLE_UPDATES=true + +# How many processes should be spawned. As a reasonable rule divide your servers +# available memory by 512 for a rough estimate +WEB_CONCURRENCY=1 + +# You can remove this line if your reverse proxy already logs incoming http +# requests and this ends up being duplicative +DEBUG=http + +# Configure lowest severity level for server logs. Should be one of +# error, warn, info, http, verbose, debug and silly +LOG_LEVEL=info + +# For a complete Slack integration with search and posting to channels the +# following configs are also needed, some more details +# => https://wiki.generaloutline.com/share/be25efd1-b3ef-4450-b8e5-c4a4fc11e02a +# +SLACK_VERIFICATION_TOKEN=your_token +SLACK_APP_ID=A0XXXXXXX +SLACK_MESSAGE_ACTIONS=true + +# Optionally enable Sentry (sentry.io) to track errors and performance, +# and optionally add a Sentry proxy tunnel for bypassing ad blockers in the UI: +# https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option) +SENTRY_DSN= +SENTRY_TUNNEL= + +# To support sending outgoing transactional emails such as "document updated" or +# "you've been invited" you'll need to provide authentication for an SMTP server +SMTP_HOST= +SMTP_PORT= +SMTP_USERNAME= +SMTP_PASSWORD= +SMTP_FROM_EMAIL= +SMTP_REPLY_EMAIL= +SMTP_TLS_CIPHERS= +SMTP_SECURE=true + +# The default interface language. See translate.getoutline.com for a list of +# available language codes and their rough percentage translated. +DEFAULT_LANGUAGE=zh_CN + +# Optionally enable rate limiter at application web server +RATE_LIMITER_ENABLED=true + +# Configure default throttling parameters for rate limiter +RATE_LIMITER_REQUESTS=1000 +RATE_LIMITER_DURATION_WINDOW=60 + +# Iframely API config +# https://iframe.ly/api/oembed +# https://iframe.ly/api/iframely +IFRAMELY_URL=https://iframe.ly/api/iframely +# IFRAMELY_API_KEY= diff --git a/apps/outline/0.81.1/scripts/init.sh b/apps/outline/0.81.1/scripts/init.sh index b71a9adc0..df380dc9a 100644 --- a/apps/outline/0.81.1/scripts/init.sh +++ b/apps/outline/0.81.1/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env # setup-2 remove empty values sed -i '/^.*=""/d' .env diff --git a/apps/outline/0.81.1/scripts/upgrade.sh b/apps/outline/0.81.1/scripts/upgrade.sh index 70ba8d3da..754933ac9 100644 --- a/apps/outline/0.81.1/scripts/upgrade.sh +++ b/apps/outline/0.81.1/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/outline.env" >> .env chmod 777 -R "$OUTLINE_ROOT_PATH" diff --git a/apps/page-spy-web/1.9.6/docker-compose.yml b/apps/page-spy-web/1.9.6/docker-compose.yml index b7e11c35b..d098eeff4 100644 --- a/apps/page-spy-web/1.9.6/docker-compose.yml +++ b/apps/page-spy-web/1.9.6/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:6752 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PAGE_SPY_WEB_ROOT_PATH}/log:/app/log diff --git a/apps/page-spy-web/1.9.6/envs/default.env b/apps/page-spy-web/1.9.6/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/page-spy-web/1.9.6/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/page-spy-web/1.9.6/envs/global.env b/apps/page-spy-web/1.9.6/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/page-spy-web/1.9.6/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/page-spy-web/1.9.6/scripts/init.sh b/apps/page-spy-web/1.9.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/page-spy-web/1.9.6/scripts/init.sh +++ b/apps/page-spy-web/1.9.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/page-spy-web/1.9.6/scripts/upgrade.sh b/apps/page-spy-web/1.9.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/page-spy-web/1.9.6/scripts/upgrade.sh +++ b/apps/page-spy-web/1.9.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/percona/8.0/docker-compose.yml b/apps/percona/8.0/docker-compose.yml index 83a31a261..91d9b6eed 100644 --- a/apps/percona/8.0/docker-compose.yml +++ b/apps/percona/8.0/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3306 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PERCONA_ROOT_PATH}/data:/var/lib/mysql diff --git a/apps/percona/8.0/envs/default.env b/apps/percona/8.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/percona/8.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/percona/8.0/envs/global.env b/apps/percona/8.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/percona/8.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/percona/8.0/scripts/init.sh b/apps/percona/8.0/scripts/init.sh index 5179ad729..ae47f700c 100644 --- a/apps/percona/8.0/scripts/init.sh +++ b/apps/percona/8.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env mkdir -p "$PERCONA_ROOT_PATH" mkdir -p "$PERCONA_ROOT_PATH/config" diff --git a/apps/percona/8.0/scripts/upgrade.sh b/apps/percona/8.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/percona/8.0/scripts/upgrade.sh +++ b/apps/percona/8.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/photoprism/240915/docker-compose.yml b/apps/photoprism/240915/docker-compose.yml index 873fc9d51..97c692f99 100644 --- a/apps/photoprism/240915/docker-compose.yml +++ b/apps/photoprism/240915/docker-compose.yml @@ -29,8 +29,8 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - /etc/1panel/envs/global.env - - /etc/1panel/envs/photoprism/photoprism.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${APP_ENV_FILE:-/etc/1panel/envs/photoprism/photoprism.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PHOTOPRISM_ROOT_PATH}/originals:/photoprism/originals diff --git a/apps/photoprism/240915/envs/default.env b/apps/photoprism/240915/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/photoprism/240915/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/photoprism/240915/envs/global.env b/apps/photoprism/240915/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/photoprism/240915/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/photoprism/240915/envs/photoprism.env b/apps/photoprism/240915/envs/photoprism.env new file mode 100644 index 000000000..4cbf92294 --- /dev/null +++ b/apps/photoprism/240915/envs/photoprism.env @@ -0,0 +1,25 @@ +PHOTOPRISM_DISABLE_TLS="false" +PHOTOPRISM_DEFAULT_TLS="true" +PHOTOPRISM_HTTP_COMPRESSION="gzip" +PHOTOPRISM_LOG_LEVEL="info" +PHOTOPRISM_READONLY="false" +PHOTOPRISM_EXPERIMENTAL="false" +PHOTOPRISM_DISABLE_CHOWN="false" +PHOTOPRISM_DISABLE_WEBDAV="false" +PHOTOPRISM_DISABLE_SETTINGS="false" +PHOTOPRISM_DISABLE_TENSORFLOW="false" +PHOTOPRISM_DISABLE_FACES="false" +PHOTOPRISM_DISABLE_CLASSIFICATION="false" +PHOTOPRISM_DISABLE_VECTORS="false" +PHOTOPRISM_DISABLE_RAW="false" +PHOTOPRISM_RAW_PRESETS="false" +PHOTOPRISM_SIDECAR_YAML="true" +PHOTOPRISM_BACKUP_ALBUMS="true" +PHOTOPRISM_BACKUP_DATABASE="true" +PHOTOPRISM_BACKUP_SCHEDULE="daily" +PHOTOPRISM_INDEX_SCHEDULE="" +PHOTOPRISM_AUTO_INDEX=300 +PHOTOPRISM_AUTO_IMPORT=-1 +PHOTOPRISM_DETECT_NSFW="false" +PHOTOPRISM_UPLOAD_NSFW="true" +PHOTOPRISM_INIT="https gpu ffmpeg tensorflow" diff --git a/apps/photoprism/240915/scripts/init.sh b/apps/photoprism/240915/scripts/init.sh index 77b849120..b762dc6b0 100644 --- a/apps/photoprism/240915/scripts/init.sh +++ b/apps/photoprism/240915/scripts/init.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/photoprism.env" >> .env echo "Check Finish." diff --git a/apps/photoprism/240915/scripts/upgrade.sh b/apps/photoprism/240915/scripts/upgrade.sh index 77b849120..b762dc6b0 100644 --- a/apps/photoprism/240915/scripts/upgrade.sh +++ b/apps/photoprism/240915/scripts/upgrade.sh @@ -6,7 +6,11 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + sed -i '/^APP_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + echo "APP_ENV_FILE=${CURRENT_DIR}/envs/photoprism.env" >> .env echo "Check Finish." diff --git a/apps/pingvin-share/1.6.0/scripts/init.sh b/apps/pingvin-share/1.6.0/scripts/init.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/pingvin-share/1.6.0/scripts/init.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pingvin-share/1.6.0/scripts/upgrade.sh b/apps/pingvin-share/1.6.0/scripts/upgrade.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/pingvin-share/1.6.0/scripts/upgrade.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/pingvin-share/1.6.0/data.yml b/apps/pingvin-share/1.6.1/data.yml similarity index 100% rename from apps/pingvin-share/1.6.0/data.yml rename to apps/pingvin-share/1.6.1/data.yml diff --git a/apps/pingvin-share/1.6.0/docker-compose.yml b/apps/pingvin-share/1.6.1/docker-compose.yml similarity index 85% rename from apps/pingvin-share/1.6.0/docker-compose.yml rename to apps/pingvin-share/1.6.1/docker-compose.yml index 4321344ae..4eaec5ba5 100644 --- a/apps/pingvin-share/1.6.0/docker-compose.yml +++ b/apps/pingvin-share/1.6.1/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: pingvin-share: - image: stonith404/pingvin-share:v1.6.0 + image: stonith404/pingvin-share:v1.6.1 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3333 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PINGVIN_SHARE_ROOT_PATH}/data:/opt/app/backend/data diff --git a/apps/pingvin-share/1.6.1/envs/default.env b/apps/pingvin-share/1.6.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/pingvin-share/1.6.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/pingvin-share/1.6.1/envs/global.env b/apps/pingvin-share/1.6.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/pingvin-share/1.6.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/pingvin-share/1.6.1/scripts/init.sh b/apps/pingvin-share/1.6.1/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/pingvin-share/1.6.1/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/prowlarr/1.26.1/scripts/uninstall.sh b/apps/pingvin-share/1.6.1/scripts/uninstall.sh similarity index 100% rename from apps/prowlarr/1.26.1/scripts/uninstall.sh rename to apps/pingvin-share/1.6.1/scripts/uninstall.sh diff --git a/apps/pingvin-share/1.6.1/scripts/upgrade.sh b/apps/pingvin-share/1.6.1/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/pingvin-share/1.6.1/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/pixman/1.8.2/docker-compose.yml b/apps/pixman/1.8.2/docker-compose.yml index 2e135c25b..2a280d4ba 100644 --- a/apps/pixman/1.8.2/docker-compose.yml +++ b/apps/pixman/1.8.2/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PIXMAN_ROOT_PATH}/m3u:/app/app/data/m3u diff --git a/apps/pixman/1.8.2/envs/default.env b/apps/pixman/1.8.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/pixman/1.8.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/pixman/1.8.2/envs/global.env b/apps/pixman/1.8.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/pixman/1.8.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/pixman/1.8.2/scripts/init.sh b/apps/pixman/1.8.2/scripts/init.sh index f3ec51b1d..a33a4a556 100644 --- a/apps/pixman/1.8.2/scripts/init.sh +++ b/apps/pixman/1.8.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env if [ ! -d $PIXMAN_ROOT_PATH/m3u ]; then mkdir -p $PIXMAN_ROOT_PATH/m3u diff --git a/apps/pixman/1.8.2/scripts/upgrade.sh b/apps/pixman/1.8.2/scripts/upgrade.sh index f3ec51b1d..a33a4a556 100644 --- a/apps/pixman/1.8.2/scripts/upgrade.sh +++ b/apps/pixman/1.8.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env if [ ! -d $PIXMAN_ROOT_PATH/m3u ]; then mkdir -p $PIXMAN_ROOT_PATH/m3u diff --git a/apps/postgresql/16.6-alpine/docker-compose.yml b/apps/postgresql/16.6-alpine/docker-compose.yml index 1cf2dd584..f1c8fadea 100644 --- a/apps/postgresql/16.6-alpine/docker-compose.yml +++ b/apps/postgresql/16.6-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/16.6-alpine/envs/default.env b/apps/postgresql/16.6-alpine/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/16.6-alpine/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/16.6-alpine/envs/global.env b/apps/postgresql/16.6-alpine/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/16.6-alpine/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/16.6-alpine/scripts/init.sh b/apps/postgresql/16.6-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/16.6-alpine/scripts/init.sh +++ b/apps/postgresql/16.6-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/16.6-alpine/scripts/upgrade.sh b/apps/postgresql/16.6-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/16.6-alpine/scripts/upgrade.sh +++ b/apps/postgresql/16.6-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/16.6/docker-compose.yml b/apps/postgresql/16.6/docker-compose.yml index 5eaa1e4ce..eb4e95f94 100644 --- a/apps/postgresql/16.6/docker-compose.yml +++ b/apps/postgresql/16.6/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/16.6/envs/default.env b/apps/postgresql/16.6/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/16.6/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/16.6/envs/global.env b/apps/postgresql/16.6/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/16.6/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/16.6/scripts/init.sh b/apps/postgresql/16.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/16.6/scripts/init.sh +++ b/apps/postgresql/16.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/16.6/scripts/upgrade.sh b/apps/postgresql/16.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/16.6/scripts/upgrade.sh +++ b/apps/postgresql/16.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/17.2-alpine/docker-compose.yml b/apps/postgresql/17.2-alpine/docker-compose.yml index 5db80e741..479b68e95 100644 --- a/apps/postgresql/17.2-alpine/docker-compose.yml +++ b/apps/postgresql/17.2-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/17.2-alpine/envs/default.env b/apps/postgresql/17.2-alpine/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/17.2-alpine/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/17.2-alpine/envs/global.env b/apps/postgresql/17.2-alpine/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/17.2-alpine/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/17.2-alpine/scripts/init.sh b/apps/postgresql/17.2-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/17.2-alpine/scripts/init.sh +++ b/apps/postgresql/17.2-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/17.2-alpine/scripts/upgrade.sh b/apps/postgresql/17.2-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/17.2-alpine/scripts/upgrade.sh +++ b/apps/postgresql/17.2-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/17.2/docker-compose.yml b/apps/postgresql/17.2/docker-compose.yml index b7d889daa..de00707a9 100644 --- a/apps/postgresql/17.2/docker-compose.yml +++ b/apps/postgresql/17.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/17.2/envs/default.env b/apps/postgresql/17.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/17.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/17.2/envs/global.env b/apps/postgresql/17.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/17.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/17.2/scripts/init.sh b/apps/postgresql/17.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/17.2/scripts/init.sh +++ b/apps/postgresql/17.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/17.2/scripts/upgrade.sh b/apps/postgresql/17.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/17.2/scripts/upgrade.sh +++ b/apps/postgresql/17.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-alpine/docker-compose.yml b/apps/postgresql/pg14-alpine/docker-compose.yml index 038e68b14..416ad6c68 100644 --- a/apps/postgresql/pg14-alpine/docker-compose.yml +++ b/apps/postgresql/pg14-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg14-alpine/envs/default.env b/apps/postgresql/pg14-alpine/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg14-alpine/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg14-alpine/envs/global.env b/apps/postgresql/pg14-alpine/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg14-alpine/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg14-alpine/scripts/init.sh b/apps/postgresql/pg14-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg14-alpine/scripts/init.sh +++ b/apps/postgresql/pg14-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-alpine/scripts/upgrade.sh b/apps/postgresql/pg14-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg14-alpine/scripts/upgrade.sh +++ b/apps/postgresql/pg14-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-vectors/docker-compose.yml b/apps/postgresql/pg14-vectors/docker-compose.yml index d5a979f94..6925a6975 100644 --- a/apps/postgresql/pg14-vectors/docker-compose.yml +++ b/apps/postgresql/pg14-vectors/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg14-vectors/envs/default.env b/apps/postgresql/pg14-vectors/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg14-vectors/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg14-vectors/envs/global.env b/apps/postgresql/pg14-vectors/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg14-vectors/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg14-vectors/scripts/init.sh b/apps/postgresql/pg14-vectors/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg14-vectors/scripts/init.sh +++ b/apps/postgresql/pg14-vectors/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14-vectors/scripts/upgrade.sh b/apps/postgresql/pg14-vectors/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg14-vectors/scripts/upgrade.sh +++ b/apps/postgresql/pg14-vectors/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14/docker-compose.yml b/apps/postgresql/pg14/docker-compose.yml index 86edcbbe2..5510b8e2e 100644 --- a/apps/postgresql/pg14/docker-compose.yml +++ b/apps/postgresql/pg14/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg14/envs/default.env b/apps/postgresql/pg14/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg14/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg14/envs/global.env b/apps/postgresql/pg14/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg14/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg14/scripts/init.sh b/apps/postgresql/pg14/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg14/scripts/init.sh +++ b/apps/postgresql/pg14/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg14/scripts/upgrade.sh b/apps/postgresql/pg14/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg14/scripts/upgrade.sh +++ b/apps/postgresql/pg14/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-alpine/docker-compose.yml b/apps/postgresql/pg15-alpine/docker-compose.yml index 58128c8b7..cf4f24ca1 100644 --- a/apps/postgresql/pg15-alpine/docker-compose.yml +++ b/apps/postgresql/pg15-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg15-alpine/envs/default.env b/apps/postgresql/pg15-alpine/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg15-alpine/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg15-alpine/envs/global.env b/apps/postgresql/pg15-alpine/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg15-alpine/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg15-alpine/scripts/init.sh b/apps/postgresql/pg15-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg15-alpine/scripts/init.sh +++ b/apps/postgresql/pg15-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-alpine/scripts/upgrade.sh b/apps/postgresql/pg15-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg15-alpine/scripts/upgrade.sh +++ b/apps/postgresql/pg15-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-vectors/docker-compose.yml b/apps/postgresql/pg15-vectors/docker-compose.yml index 422901f93..5abb791dc 100644 --- a/apps/postgresql/pg15-vectors/docker-compose.yml +++ b/apps/postgresql/pg15-vectors/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg15-vectors/envs/default.env b/apps/postgresql/pg15-vectors/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg15-vectors/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg15-vectors/envs/global.env b/apps/postgresql/pg15-vectors/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg15-vectors/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg15-vectors/scripts/init.sh b/apps/postgresql/pg15-vectors/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg15-vectors/scripts/init.sh +++ b/apps/postgresql/pg15-vectors/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15-vectors/scripts/upgrade.sh b/apps/postgresql/pg15-vectors/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg15-vectors/scripts/upgrade.sh +++ b/apps/postgresql/pg15-vectors/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15/docker-compose.yml b/apps/postgresql/pg15/docker-compose.yml index 7f2b15361..17d11df83 100644 --- a/apps/postgresql/pg15/docker-compose.yml +++ b/apps/postgresql/pg15/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg15/envs/default.env b/apps/postgresql/pg15/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg15/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg15/envs/global.env b/apps/postgresql/pg15/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg15/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg15/scripts/init.sh b/apps/postgresql/pg15/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg15/scripts/init.sh +++ b/apps/postgresql/pg15/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg15/scripts/upgrade.sh b/apps/postgresql/pg15/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg15/scripts/upgrade.sh +++ b/apps/postgresql/pg15/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-alpine/docker-compose.yml b/apps/postgresql/pg16-alpine/docker-compose.yml index 4cd236c76..8ed2c2e67 100644 --- a/apps/postgresql/pg16-alpine/docker-compose.yml +++ b/apps/postgresql/pg16-alpine/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg16-alpine/envs/default.env b/apps/postgresql/pg16-alpine/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg16-alpine/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg16-alpine/envs/global.env b/apps/postgresql/pg16-alpine/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg16-alpine/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg16-alpine/scripts/init.sh b/apps/postgresql/pg16-alpine/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg16-alpine/scripts/init.sh +++ b/apps/postgresql/pg16-alpine/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-alpine/scripts/upgrade.sh b/apps/postgresql/pg16-alpine/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg16-alpine/scripts/upgrade.sh +++ b/apps/postgresql/pg16-alpine/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-vectors/docker-compose.yml b/apps/postgresql/pg16-vectors/docker-compose.yml index b1f04ece4..be4d7d9cb 100644 --- a/apps/postgresql/pg16-vectors/docker-compose.yml +++ b/apps/postgresql/pg16-vectors/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg16-vectors/envs/default.env b/apps/postgresql/pg16-vectors/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg16-vectors/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg16-vectors/envs/global.env b/apps/postgresql/pg16-vectors/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg16-vectors/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg16-vectors/scripts/init.sh b/apps/postgresql/pg16-vectors/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg16-vectors/scripts/init.sh +++ b/apps/postgresql/pg16-vectors/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16-vectors/scripts/upgrade.sh b/apps/postgresql/pg16-vectors/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg16-vectors/scripts/upgrade.sh +++ b/apps/postgresql/pg16-vectors/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16/docker-compose.yml b/apps/postgresql/pg16/docker-compose.yml index f2dce1196..f186cdabc 100644 --- a/apps/postgresql/pg16/docker-compose.yml +++ b/apps/postgresql/pg16/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:5432 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${POSTGRES_ROOT_PATH}/data:/var/lib/postgresql/data diff --git a/apps/postgresql/pg16/envs/default.env b/apps/postgresql/pg16/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/postgresql/pg16/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/postgresql/pg16/envs/global.env b/apps/postgresql/pg16/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/postgresql/pg16/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/postgresql/pg16/scripts/init.sh b/apps/postgresql/pg16/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg16/scripts/init.sh +++ b/apps/postgresql/pg16/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/postgresql/pg16/scripts/upgrade.sh b/apps/postgresql/pg16/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/postgresql/pg16/scripts/upgrade.sh +++ b/apps/postgresql/pg16/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/prowlarr/1.26.1/scripts/init.sh b/apps/prowlarr/1.26.1/scripts/init.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/prowlarr/1.26.1/scripts/init.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/prowlarr/1.26.1/scripts/upgrade.sh b/apps/prowlarr/1.26.1/scripts/upgrade.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/prowlarr/1.26.1/scripts/upgrade.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/prowlarr/1.26.1/data.yml b/apps/prowlarr/1.27.0/data.yml similarity index 100% rename from apps/prowlarr/1.26.1/data.yml rename to apps/prowlarr/1.27.0/data.yml diff --git a/apps/prowlarr/1.26.1/docker-compose.yml b/apps/prowlarr/1.27.0/docker-compose.yml similarity index 83% rename from apps/prowlarr/1.26.1/docker-compose.yml rename to apps/prowlarr/1.27.0/docker-compose.yml index 5b6aa43f1..49bb6a058 100644 --- a/apps/prowlarr/1.26.1/docker-compose.yml +++ b/apps/prowlarr/1.27.0/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: prowlarr: - image: linuxserver/prowlarr:1.26.1 + image: linuxserver/prowlarr:1.27.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:9696 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PROWLARR_ROOT_PATH}/config:/config diff --git a/apps/prowlarr/1.27.0/envs/default.env b/apps/prowlarr/1.27.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/prowlarr/1.27.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/prowlarr/1.27.0/envs/global.env b/apps/prowlarr/1.27.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/prowlarr/1.27.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/prowlarr/1.27.0/scripts/init.sh b/apps/prowlarr/1.27.0/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/prowlarr/1.27.0/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/rsshub/2024-11-25/scripts/uninstall.sh b/apps/prowlarr/1.27.0/scripts/uninstall.sh similarity index 100% rename from apps/rsshub/2024-11-25/scripts/uninstall.sh rename to apps/prowlarr/1.27.0/scripts/uninstall.sh diff --git a/apps/prowlarr/1.27.0/scripts/upgrade.sh b/apps/prowlarr/1.27.0/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/prowlarr/1.27.0/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/puff/0.2.2/docker-compose.yml b/apps/puff/0.2.2/docker-compose.yml index 1d5317c89..cce843dde 100644 --- a/apps/puff/0.2.2/docker-compose.yml +++ b/apps/puff/0.2.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${PUFF_ROOT_PATH}/data:/app/data diff --git a/apps/puff/0.2.2/envs/default.env b/apps/puff/0.2.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/puff/0.2.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/puff/0.2.2/envs/global.env b/apps/puff/0.2.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/puff/0.2.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/puff/0.2.2/scripts/init.sh b/apps/puff/0.2.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/puff/0.2.2/scripts/init.sh +++ b/apps/puff/0.2.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/puff/0.2.2/scripts/upgrade.sh b/apps/puff/0.2.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/puff/0.2.2/scripts/upgrade.sh +++ b/apps/puff/0.2.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/qbittorrent/4.6.7/docker-compose.yml b/apps/qbittorrent/4.6.7/docker-compose.yml index c4e5f5f3c..e351cac1b 100644 --- a/apps/qbittorrent/4.6.7/docker-compose.yml +++ b/apps/qbittorrent/4.6.7/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_TORRENTING} - ${PANEL_APP_PORT_TORRENTING}/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} volumes: - ${QBITTORRENT_ROOT_PATH}/config:/config - ${QBITTORRENT_ROOT_PATH}/downloads:/downloads diff --git a/apps/qbittorrent/4.6.7/envs/default.env b/apps/qbittorrent/4.6.7/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/qbittorrent/4.6.7/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/qbittorrent/4.6.7/envs/global.env b/apps/qbittorrent/4.6.7/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/qbittorrent/4.6.7/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/qbittorrent/5.0.2/docker-compose.yml b/apps/qbittorrent/5.0.2/docker-compose.yml index 2f5f65080..1397dba98 100644 --- a/apps/qbittorrent/5.0.2/docker-compose.yml +++ b/apps/qbittorrent/5.0.2/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_TORRENTING} - ${PANEL_APP_PORT_TORRENTING}/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} volumes: - ${QBITTORRENT_ROOT_PATH}/config:/config - ${QBITTORRENT_ROOT_PATH}/downloads:/downloads diff --git a/apps/qbittorrent/5.0.2/envs/default.env b/apps/qbittorrent/5.0.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/qbittorrent/5.0.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/qbittorrent/5.0.2/envs/global.env b/apps/qbittorrent/5.0.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/qbittorrent/5.0.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/qinglong/2.17.12/envs/default.env b/apps/qinglong/2.17.12/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/qinglong/2.17.12/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/qinglong/2.17.12/envs/global.env b/apps/qinglong/2.17.12/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/qinglong/2.17.12/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/radarr/5.15.1/docker-compose.yml b/apps/radarr/5.15.1/docker-compose.yml index 4e75ec8c4..069e29eab 100644 --- a/apps/radarr/5.15.1/docker-compose.yml +++ b/apps/radarr/5.15.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:7878 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${RADARR_ROOT_PATH}/config:/config diff --git a/apps/radarr/5.15.1/envs/default.env b/apps/radarr/5.15.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/radarr/5.15.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/radarr/5.15.1/envs/global.env b/apps/radarr/5.15.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/radarr/5.15.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/radarr/5.15.1/scripts/init.sh b/apps/radarr/5.15.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/radarr/5.15.1/scripts/init.sh +++ b/apps/radarr/5.15.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/radarr/5.15.1/scripts/upgrade.sh b/apps/radarr/5.15.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/radarr/5.15.1/scripts/upgrade.sh +++ b/apps/radarr/5.15.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/reader3-webview/3.2.0/docker-compose.yml b/apps/reader3-webview/3.2.0/docker-compose.yml index 708b77176..e1082b550 100644 --- a/apps/reader3-webview/3.2.0/docker-compose.yml +++ b/apps/reader3-webview/3.2.0/docker-compose.yml @@ -14,4 +14,4 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8050 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} diff --git a/apps/reader3-webview/3.2.0/envs/default.env b/apps/reader3-webview/3.2.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/reader3-webview/3.2.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/reader3-webview/3.2.0/envs/global.env b/apps/reader3-webview/3.2.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/reader3-webview/3.2.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/reader3/3.2.10/docker-compose.yml b/apps/reader3/3.2.10/docker-compose.yml index c256bc9bb..d6602d9e6 100644 --- a/apps/reader3/3.2.10/docker-compose.yml +++ b/apps/reader3/3.2.10/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${READER3_ROOT_PATH}/logs:/logs diff --git a/apps/reader3/3.2.10/envs/default.env b/apps/reader3/3.2.10/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/reader3/3.2.10/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/reader3/3.2.10/envs/global.env b/apps/reader3/3.2.10/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/reader3/3.2.10/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/reader3/3.2.10/scripts/init.sh b/apps/reader3/3.2.10/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/reader3/3.2.10/scripts/init.sh +++ b/apps/reader3/3.2.10/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/reader3/3.2.10/scripts/upgrade.sh b/apps/reader3/3.2.10/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/reader3/3.2.10/scripts/upgrade.sh +++ b/apps/reader3/3.2.10/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/redis/6.2.16/envs/default.env b/apps/redis/6.2.16/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/redis/6.2.16/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/redis/6.2.16/envs/global.env b/apps/redis/6.2.16/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/redis/6.2.16/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/redis/7.4.1/envs/default.env b/apps/redis/7.4.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/redis/7.4.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/redis/7.4.1/envs/global.env b/apps/redis/7.4.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/redis/7.4.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/rsshub/2024-11-25/scripts/init.sh b/apps/rsshub/2024-11-25/scripts/init.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/rsshub/2024-11-25/scripts/init.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rsshub/2024-11-25/scripts/upgrade.sh b/apps/rsshub/2024-11-25/scripts/upgrade.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/rsshub/2024-11-25/scripts/upgrade.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/rsshub/2024-11-25/data.yml b/apps/rsshub/2024-11-27/data.yml similarity index 100% rename from apps/rsshub/2024-11-25/data.yml rename to apps/rsshub/2024-11-27/data.yml diff --git a/apps/rsshub/2024-11-25/docker-compose.yml b/apps/rsshub/2024-11-27/docker-compose.yml similarity index 93% rename from apps/rsshub/2024-11-25/docker-compose.yml rename to apps/rsshub/2024-11-27/docker-compose.yml index c619f19fe..c6a21b598 100644 --- a/apps/rsshub/2024-11-25/docker-compose.yml +++ b/apps/rsshub/2024-11-27/docker-compose.yml @@ -23,7 +23,7 @@ services: timeout: 10s retries: 3 rsshub: - image: diygod/rsshub:2024-11-25 + image: diygod/rsshub:2024-11-27 container_name: rsshub-${CONTAINER_NAME} depends_on: - browserless @@ -35,7 +35,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:1200 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - NODE_ENV=production diff --git a/apps/rsshub/2024-11-27/envs/default.env b/apps/rsshub/2024-11-27/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/rsshub/2024-11-27/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/rsshub/2024-11-27/envs/global.env b/apps/rsshub/2024-11-27/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/rsshub/2024-11-27/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/rsshub/2024-11-27/scripts/init.sh b/apps/rsshub/2024-11-27/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/rsshub/2024-11-27/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/sonarr/4.0.10/scripts/uninstall.sh b/apps/rsshub/2024-11-27/scripts/uninstall.sh similarity index 100% rename from apps/sonarr/4.0.10/scripts/uninstall.sh rename to apps/rsshub/2024-11-27/scripts/uninstall.sh diff --git a/apps/rsshub/2024-11-27/scripts/upgrade.sh b/apps/rsshub/2024-11-27/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/rsshub/2024-11-27/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/sentinel/1.8.8/envs/default.env b/apps/sentinel/1.8.8/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/sentinel/1.8.8/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/sentinel/1.8.8/envs/global.env b/apps/sentinel/1.8.8/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/sentinel/1.8.8/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/sentinel/1.8.8/scripts/init.sh b/apps/sentinel/1.8.8/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/sentinel/1.8.8/scripts/init.sh +++ b/apps/sentinel/1.8.8/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/sentinel/1.8.8/scripts/upgrade.sh b/apps/sentinel/1.8.8/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/sentinel/1.8.8/scripts/upgrade.sh +++ b/apps/sentinel/1.8.8/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/shiori/1.7.1/docker-compose.yml b/apps/shiori/1.7.1/docker-compose.yml index 89b7e7df5..5d0948ec4 100644 --- a/apps/shiori/1.7.1/docker-compose.yml +++ b/apps/shiori/1.7.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8080 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SHIORI_ROOT_PATH}/dev-data:/srv/shiori diff --git a/apps/shiori/1.7.1/envs/default.env b/apps/shiori/1.7.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/shiori/1.7.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/shiori/1.7.1/envs/global.env b/apps/shiori/1.7.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/shiori/1.7.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/shiori/1.7.1/scripts/init.sh b/apps/shiori/1.7.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/shiori/1.7.1/scripts/init.sh +++ b/apps/shiori/1.7.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/shiori/1.7.1/scripts/upgrade.sh b/apps/shiori/1.7.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/shiori/1.7.1/scripts/upgrade.sh +++ b/apps/shiori/1.7.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/siyuan/3.1.13/docker-compose.yml b/apps/siyuan/3.1.13/docker-compose.yml index 46c6b6c2a..87a89a3ea 100644 --- a/apps/siyuan/3.1.13/docker-compose.yml +++ b/apps/siyuan/3.1.13/docker-compose.yml @@ -16,7 +16,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:6806 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} volumes: - ${SIYUAN_ROOT_PATH}/workspace:/siyuan/workspace environment: diff --git a/apps/siyuan/3.1.13/envs/default.env b/apps/siyuan/3.1.13/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/siyuan/3.1.13/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/siyuan/3.1.13/envs/global.env b/apps/siyuan/3.1.13/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/siyuan/3.1.13/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/slink/1.2.1/docker-compose.yml b/apps/slink/1.2.1/docker-compose.yml index 3f8ba91ad..da748bc94 100644 --- a/apps/slink/1.2.1/docker-compose.yml +++ b/apps/slink/1.2.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SLINK_ROOT_PATH}/data:/app/var/data diff --git a/apps/slink/1.2.1/envs/default.env b/apps/slink/1.2.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/slink/1.2.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/slink/1.2.1/envs/global.env b/apps/slink/1.2.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/slink/1.2.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/slink/1.2.1/scripts/init.sh b/apps/slink/1.2.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/slink/1.2.1/scripts/init.sh +++ b/apps/slink/1.2.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/slink/1.2.1/scripts/upgrade.sh b/apps/slink/1.2.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/slink/1.2.1/scripts/upgrade.sh +++ b/apps/slink/1.2.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/sonarr/4.0.10/scripts/init.sh b/apps/sonarr/4.0.10/scripts/init.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/sonarr/4.0.10/scripts/init.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/sonarr/4.0.10/scripts/upgrade.sh b/apps/sonarr/4.0.10/scripts/upgrade.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/sonarr/4.0.10/scripts/upgrade.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/sonarr/4.0.10/data.yml b/apps/sonarr/4.0.11/data.yml similarity index 100% rename from apps/sonarr/4.0.10/data.yml rename to apps/sonarr/4.0.11/data.yml diff --git a/apps/sonarr/4.0.10/docker-compose.yml b/apps/sonarr/4.0.11/docker-compose.yml similarity index 90% rename from apps/sonarr/4.0.10/docker-compose.yml rename to apps/sonarr/4.0.11/docker-compose.yml index 06d628e80..da145d2cd 100644 --- a/apps/sonarr/4.0.10/docker-compose.yml +++ b/apps/sonarr/4.0.11/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: sonarr: - image: linuxserver/sonarr:4.0.10 + image: linuxserver/sonarr:4.0.11 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8989 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SONARR_ROOT_PATH}/config:/config diff --git a/apps/sonarr/4.0.11/envs/default.env b/apps/sonarr/4.0.11/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/sonarr/4.0.11/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/sonarr/4.0.11/envs/global.env b/apps/sonarr/4.0.11/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/sonarr/4.0.11/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/sonarr/4.0.11/scripts/init.sh b/apps/sonarr/4.0.11/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/sonarr/4.0.11/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/synapse/1.119.0/scripts/uninstall.sh b/apps/sonarr/4.0.11/scripts/uninstall.sh similarity index 100% rename from apps/synapse/1.119.0/scripts/uninstall.sh rename to apps/sonarr/4.0.11/scripts/uninstall.sh diff --git a/apps/sonarr/4.0.11/scripts/upgrade.sh b/apps/sonarr/4.0.11/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/sonarr/4.0.11/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/speedtest-tracker-sqlite/0.24.3/data.yml b/apps/speedtest-tracker-sqlite/0.24.3/data.yml new file mode 100644 index 000000000..7670657e5 --- /dev/null +++ b/apps/speedtest-tracker-sqlite/0.24.3/data.yml @@ -0,0 +1,150 @@ +additionalProperties: + formFields: + - default: "/home/speedtest-tracker" + edit: true + envKey: SPEEDTEST_TRACKER_ROOT_PATH + labelEn: Data persistence root path + labelZh: 数据持久化 根路径 + required: true + type: text + - default: "host" + edit: true + envKey: NETWORK_MODE + labelEn: Drive path + labelZh: 网络模式 + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Server port + labelZh: Web 服务端口 + required: true + rule: paramPort + type: number + - default: "base64:f0Ivk1nHd3QwXtR55WKC4fcc7QjrxxTnkiB02ipdl60=" + edit: true + envKey: APP_KEY + labelZh: 应用密钥 (官网获取) + labelEn: App key (Get from official website) + required: true + type: text + - default: "SpeedTest Tracker" + edit: true + envKey: APP_NAME + labelZh: 应用名称 + labelEn: App Name + required: true + type: text + - default: "http://127.0.0.1:8080" + edit: true + envKey: APP_URL + labelZh: 应用访问地址 + labelEn: App URL + required: true + type: text + - default: 0 + edit: true + envKey: PRUNE_RESULTS_OLDER_THAN + labelZh: 测试结果保留天数 + labelEn: Prune results older than + required: true + type: text + - default: "0 */6 * * *" + edit: true + envKey: SPEEDTEST_SCHEDULE + labelZh: 测试计划任务 + labelEn: Speedtest schedule + required: false + type: text + - default: "" + edit: true + envKey: SPEEDTEST_SERVERS + labelZh: 指定测试服务器 + labelEn: Specify servers + required: false + type: text + - default: "smtp" + edit: true + envKey: MAIL_MAILER + labelZh: 邮件 协议 + labelEn: Mail mailer + required: true + type: text + - default: "smtp.gmail.com" + edit: true + envKey: MAIL_HOST + labelZh: 邮件 主机地址 + labelEn: Mail host + required: true + type: text + - default: 465 + edit: true + envKey: MAIL_PORT + labelZh: 邮件 主机端口 + labelEn: Mail port + required: true + type: number + - default: "" + edit: true + envKey: MAIL_USERNAME + labelZh: 邮件 鉴权用户名 + labelEn: Mail username + required: false + type: text + - default: "" + edit: true + envKey: MAIL_PASSWORD + labelZh: 邮件 鉴权密码 + labelEn: Mail password + required: false + type: text + - default: "" + edit: true + envKey: MAIL_FROM_ADDRESS + labelZh: 邮件 发件地址 + labelEn: Mail from address + required: false + type: text + - default: "Speedtest Tracker" + edit: true + envKey: MAIL_FROM_NAME + labelZh: 邮件 发件名称 + labelEn: Mail from name + required: true + type: text + - default: "tls" + edit: true + envKey: MAIL_ENCRYPTION + labelZh: 邮件 加密方式 + labelEn: Mail encryption + required: true + type: text + - default: "" + edit: true + envKey: TELEGRAM_BOT_TOKEN + labelZh: Telegram 机器人令牌 + labelEn: Telegram bot token + required: false + type: text + - default: "file" + edit: true + envKey: CACHE_DRIVER + labelZh: 缓存 驱动 + labelEn: Cache driver + required: true + type: select + values: + - label: 文件缓存 + value: "file" + - label: 数据库缓存 + value: "database" diff --git a/apps/speedtest-tracker-sqlite/0.24.3/docker-compose.yml b/apps/speedtest-tracker-sqlite/0.24.3/docker-compose.yml new file mode 100644 index 000000000..99fdb0ac9 --- /dev/null +++ b/apps/speedtest-tracker-sqlite/0.24.3/docker-compose.yml @@ -0,0 +1,26 @@ +networks: + 1panel-network: + external: true + +services: + speedtest-tracker: + image: linuxserver/speedtest-tracker:0.24.3 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:80 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${SPEEDTEST_TRACKER_ROOT_PATH}/config:/config + environment: + - PUID=1000 + - PGID=1000 + - TZ=Asia/Shanghai + - DISPLAY_TIMEZONE=Asia/Shanghai + - DB_CONNECTION=sqlite + - MAIL_MAILER=sqlite diff --git a/apps/speedtest-tracker-sqlite/0.24.3/envs/default.env b/apps/speedtest-tracker-sqlite/0.24.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/speedtest-tracker-sqlite/0.24.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/speedtest-tracker-sqlite/0.24.3/envs/global.env b/apps/speedtest-tracker-sqlite/0.24.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/speedtest-tracker-sqlite/0.24.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/speedtest-tracker-sqlite/0.24.3/scripts/init.sh b/apps/speedtest-tracker-sqlite/0.24.3/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/speedtest-tracker-sqlite/0.24.3/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/speedtest-tracker/0.18.3/scripts/upgrade.sh b/apps/speedtest-tracker-sqlite/0.24.3/scripts/uninstall.sh similarity index 50% rename from apps/speedtest-tracker/0.18.3/scripts/upgrade.sh rename to apps/speedtest-tracker-sqlite/0.24.3/scripts/uninstall.sh index b4e373186..c86c4fbca 100644 --- a/apps/speedtest-tracker/0.18.3/scripts/upgrade.sh +++ b/apps/speedtest-tracker-sqlite/0.24.3/scripts/uninstall.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [[ -f .env ]]; then +if [ -f .env ]; then source .env echo "Check Finish." else - echo ".env not found." + echo "Error: .env file not found." fi diff --git a/apps/speedtest-tracker-sqlite/0.24.3/scripts/upgrade.sh b/apps/speedtest-tracker-sqlite/0.24.3/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/speedtest-tracker-sqlite/0.24.3/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/speedtest-tracker-sqlite/README.md b/apps/speedtest-tracker-sqlite/README.md new file mode 100644 index 000000000..81d5712d7 --- /dev/null +++ b/apps/speedtest-tracker-sqlite/README.md @@ -0,0 +1,25 @@ +# Speedtest Tracker SQLite版 + +Speedtest Tracker 的主要用例是建立互联网性能的历史记录，以便您在未收到 ISP 公布的费率时收到通知。 + +![Speedtest Tracker](https://file.lifebus.top/imgs/speedtest_tracker_cover.png) + +Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查。 + +![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) + +## 应用说明 + +Speedtest Tracker 是一个自托管的互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查。 + +由于 Speedtest 服务主要节点位于国外，所以在国内使用时可能会有一些问题，但是在国外使用时，Speedtest Tracker 是一个非常好的选择。 + +## 安装说明 + +> admin@example.com +> +> password + +--- + +![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png) diff --git a/apps/speedtest-tracker-sqlite/data.yml b/apps/speedtest-tracker-sqlite/data.yml new file mode 100644 index 000000000..722b9cf25 --- /dev/null +++ b/apps/speedtest-tracker-sqlite/data.yml @@ -0,0 +1,15 @@ +additionalProperties: + key: speedtest-tracker-sqlite + name: SpeedTest Tracker SQLite版 + tags: + - WebSite + - Middleware + - Local + shortDescZh: 托管互联网性能跟踪应用程序 + shortDescEn: Hosted internet performance tracking application + type: website + crossVersionUpdate: true + limit: 0 + website: https://docs.speedtest-tracker.dev/ + github: https://github.com/alexjustesen/speedtest-tracker + document: https://docs.speedtest-tracker.dev/ diff --git a/apps/speedtest-tracker-sqlite/logo.png b/apps/speedtest-tracker-sqlite/logo.png new file mode 100644 index 000000000..568581def Binary files /dev/null and b/apps/speedtest-tracker-sqlite/logo.png differ diff --git a/apps/speedtest-tracker/0.18.3/data.yml b/apps/speedtest-tracker/0.18.3/data.yml deleted file mode 100644 index c5892dc59..000000000 --- a/apps/speedtest-tracker/0.18.3/data.yml +++ /dev/null @@ -1,176 +0,0 @@ -additionalProperties: - formFields: - - default: "lscr.io/linuxserver/speedtest-tracker:0.18.3" - edit: true - envKey: SPEED_TEST_IMAGE - labelEn: Image source - labelZh: 镜像源 - required: true - type: select - values: - - label: "LinuxServer" - value: "lscr.io/linuxserver/speedtest-tracker:0.18.3" - - label: "GitHub" - value: "ghcr.io/alexjustesen/speedtest-tracker:v0.18.3" - - default: "/home/speedtest-tracker" - edit: true - envKey: SP_TRACKER_ROOT_PATH - labelEn: Data persistence root path - labelZh: 数据持久化 根路径 - required: true - type: text - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Server port - labelZh: Web 服务端口 - required: true - rule: paramPort - type: number - - default: 8443 - edit: true - envKey: PANEL_APP_PORT_HTTPS - labelEn: Server port - labelZh: SSL 服务端口 - required: true - rule: paramPort - type: number - - default: "Asia/Shanghai" - edit: true - envKey: SP_TRACKER_TZ - labelEn: Timezone - labelZh: 时区 - required: false - type: text - - default: "sqlite" - edit: true - envKey: SP_TRACKER_DB_TYPE - labelEn: Database type - labelZh: 数据库驱动类型 - required: true - type: select - values: - - label: MySQL (MariaDB) - value: "mysql" - - label: SQLite - value: "sqlite" - - label: PostgreSQL - value: "pgsql" - - default: "localhost" - edit: true - envKey: SP_TRACKER_DB_HOST - labelEn: Database host IP - labelZh: 数据库主机IP - required: false - type: text - - default: 3306 - edit: true - envKey: SP_TRACKER_DB_PORT - labelEn: Database Port (default 3306) - labelZh: 数据库端口 (默认3306) - required: false - rule: paramPort - type: number - - default: "speedtest_tracker" - edit: true - envKey: SP_TRACKER_DB_USER - labelEn: Database Connection Username - labelZh: 数据库 用户名 - required: false - type: text - - default: "speedtest_tracker" - edit: true - envKey: SP_TRACKER_DB_PASSWORD - labelEn: Database Connection Password - labelZh: 数据库 用户名密码 - required: false - type: password - - default: "speedtest_tracker" - edit: true - envKey: MYSQL_SERVICE_DB_NAME - labelEn: Database Name - labelZh: 数据库名称 - required: false - type: text - - default: "" - edit: true - envKey: SP_TRACKER_APP_KEY - labelEn: Application Key - labelZh: 加密存储数据的应用程序密钥 (Base64 开头) - required: false - type: text - - default: 1000 - edit: true - envKey: PUID - labelEn: User ID - labelZh: 用户ID - required: false - type: number - - default: 1000 - edit: true - envKey: PGID - labelEn: Group ID - labelZh: 组ID - required: false - type: number - - default: "smtp" - edit: true - envKey: MAIL_MAILER - labelEn: Mailer - labelZh: 协议 (SMTP) - required: false - type: text - - default: "smtp.163.com" - edit: true - envKey: MAIL_HOST - labelEn: Mail Host - labelZh: 邮件服务器地址 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_USERNAME - labelEn: Mail Username - labelZh: 邮件用户名 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_PASSWORD - labelEn: Mail Password - labelZh: 邮件账户密码 (SMTP) - required: false - type: text - - default: "ssl" - edit: true - envKey: MAIL_ENCRYPTION - labelEn: Mail Encryption - labelZh: 邮件加密方式 (SMTP) - required: false - type: select - values: - - label: "SSL" - value: "ssl" - - label: "TLS" - value: "tls" - - default: "" - edit: true - envKey: MAIL_FROM_ADDRESS - labelEn: Mail From Address - labelZh: 邮件发送地址 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_FROM_NAME - labelEn: Mail From Name - labelZh: 邮件发送者名称 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: TELEGRAM_BOT_TOKEN - labelEn: Bot Token ID (Telegram Notification) - labelZh: 机器人的令牌 ID (通知 Telegram) - required: false - type: text diff --git a/apps/speedtest-tracker/0.18.3/docker-compose.yml b/apps/speedtest-tracker/0.18.3/docker-compose.yml deleted file mode 100644 index 552f67782..000000000 --- a/apps/speedtest-tracker/0.18.3/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - speedtest-tracker: - image: ${SPEED_TEST_IMAGE} - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_HTTPS}:443 - environment: - - PUID=${PUID:-1000} - - PGID=${PGID:-1000} - - TZ=${SP_TRACKER_TZ:-Asia/Shanghai} - - DB_CONNECTION=${SP_TRACKER_DB_TYPE:-sqlite} - - DB_HOST=${SP_TRACKER_DB_HOST} - - DB_PORT=${SP_TRACKER_DB_PORT} - - DB_DATABASE=${MYSQL_SERVICE_DB_NAME} - - DB_USERNAME=${SP_TRACKER_DB_USER} - - DB_PASSWORD=${SP_TRACKER_DB_PASSWORD} - volumes: - - ${SP_TRACKER_ROOT_PATH}/config:/config - healthcheck: - test: curl -fSs APP_URL/api/healthcheck || exit 1 - interval: 10s - retries: 3 - start_period: 30s - timeout: 10s diff --git a/apps/speedtest-tracker/0.18.3/scripts/init.sh b/apps/speedtest-tracker/0.18.3/scripts/init.sh deleted file mode 100644 index 5a4fb865d..000000000 --- a/apps/speedtest-tracker/0.18.3/scripts/init.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - keys - mkdir -p "$SP_TRACKER_ROOT_PATH" - - mkdir -p "$SP_TRACKER_ROOT_PATH/conf" - mkdir -p "$SP_TRACKER_ROOT_PATH/conf/keys" - - chmod $PUID:$PGID -R "$SP_TRACKER_ROOT_PATH" - - echo "Check Finish." - -else - echo ".env not found." -fi diff --git a/apps/speedtest-tracker/0.18.7/data.yml b/apps/speedtest-tracker/0.18.7/data.yml deleted file mode 100644 index 8cd281efb..000000000 --- a/apps/speedtest-tracker/0.18.7/data.yml +++ /dev/null @@ -1,176 +0,0 @@ -additionalProperties: - formFields: - - default: "lscr.io/linuxserver/speedtest-tracker:0.18.7" - edit: true - envKey: SPEED_TEST_IMAGE - labelEn: Image source - labelZh: 镜像源 - required: true - type: select - values: - - label: "LinuxServer" - value: "lscr.io/linuxserver/speedtest-tracker:0.18.7" - - label: "GitHub" - value: "ghcr.io/alexjustesen/speedtest-tracker:v0.18.7" - - default: "/home/speedtest-tracker" - edit: true - envKey: SP_TRACKER_ROOT_PATH - labelEn: Data persistence root path - labelZh: 数据持久化 根路径 - required: true - type: text - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Server port - labelZh: Web 服务端口 - required: true - rule: paramPort - type: number - - default: 8443 - edit: true - envKey: PANEL_APP_PORT_HTTPS - labelEn: Server port - labelZh: SSL 服务端口 - required: true - rule: paramPort - type: number - - default: "Asia/Shanghai" - edit: true - envKey: SP_TRACKER_TZ - labelEn: Timezone - labelZh: 时区 - required: false - type: text - - default: "sqlite" - edit: true - envKey: SP_TRACKER_DB_TYPE - labelEn: Database type - labelZh: 数据库驱动类型 - required: true - type: select - values: - - label: MySQL (MariaDB) - value: "mysql" - - label: SQLite - value: "sqlite" - - label: PostgreSQL - value: "pgsql" - - default: "localhost" - edit: true - envKey: SP_TRACKER_DB_HOST - labelEn: Database host IP - labelZh: 数据库主机IP - required: false - type: text - - default: 3306 - edit: true - envKey: SP_TRACKER_DB_PORT - labelEn: Database Port (default 3306) - labelZh: 数据库端口 (默认3306) - required: false - rule: paramPort - type: number - - default: "speedtest_tracker" - edit: true - envKey: SP_TRACKER_DB_USER - labelEn: Database Connection Username - labelZh: 数据库 用户名 - required: false - type: text - - default: "speedtest_tracker" - edit: true - envKey: SP_TRACKER_DB_PASSWORD - labelEn: Database Connection Password - labelZh: 数据库 用户名密码 - required: false - type: password - - default: "speedtest_tracker" - edit: true - envKey: MYSQL_SERVICE_DB_NAME - labelEn: Database Name - labelZh: 数据库名称 - required: false - type: text - - default: "" - edit: true - envKey: SP_TRACKER_APP_KEY - labelEn: Application Key - labelZh: 加密存储数据的应用程序密钥 (Base64 开头) - required: false - type: text - - default: 1000 - edit: true - envKey: PUID - labelEn: User ID - labelZh: 用户ID - required: false - type: number - - default: 1000 - edit: true - envKey: PGID - labelEn: Group ID - labelZh: 组ID - required: false - type: number - - default: "smtp" - edit: true - envKey: MAIL_MAILER - labelEn: Mailer - labelZh: 协议 (SMTP) - required: false - type: text - - default: "smtp.163.com" - edit: true - envKey: MAIL_HOST - labelEn: Mail Host - labelZh: 邮件服务器地址 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_USERNAME - labelEn: Mail Username - labelZh: 邮件用户名 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_PASSWORD - labelEn: Mail Password - labelZh: 邮件账户密码 (SMTP) - required: false - type: text - - default: "ssl" - edit: true - envKey: MAIL_ENCRYPTION - labelEn: Mail Encryption - labelZh: 邮件加密方式 (SMTP) - required: false - type: select - values: - - label: "SSL" - value: "ssl" - - label: "TLS" - value: "tls" - - default: "" - edit: true - envKey: MAIL_FROM_ADDRESS - labelEn: Mail From Address - labelZh: 邮件发送地址 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_FROM_NAME - labelEn: Mail From Name - labelZh: 邮件发送者名称 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: TELEGRAM_BOT_TOKEN - labelEn: Bot Token ID (Telegram Notification) - labelZh: 机器人的令牌 ID (通知 Telegram) - required: false - type: text diff --git a/apps/speedtest-tracker/0.18.7/docker-compose.yml b/apps/speedtest-tracker/0.18.7/docker-compose.yml deleted file mode 100644 index 552f67782..000000000 --- a/apps/speedtest-tracker/0.18.7/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - speedtest-tracker: - image: ${SPEED_TEST_IMAGE} - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_HTTPS}:443 - environment: - - PUID=${PUID:-1000} - - PGID=${PGID:-1000} - - TZ=${SP_TRACKER_TZ:-Asia/Shanghai} - - DB_CONNECTION=${SP_TRACKER_DB_TYPE:-sqlite} - - DB_HOST=${SP_TRACKER_DB_HOST} - - DB_PORT=${SP_TRACKER_DB_PORT} - - DB_DATABASE=${MYSQL_SERVICE_DB_NAME} - - DB_USERNAME=${SP_TRACKER_DB_USER} - - DB_PASSWORD=${SP_TRACKER_DB_PASSWORD} - volumes: - - ${SP_TRACKER_ROOT_PATH}/config:/config - healthcheck: - test: curl -fSs APP_URL/api/healthcheck || exit 1 - interval: 10s - retries: 3 - start_period: 30s - timeout: 10s diff --git a/apps/speedtest-tracker/0.18.7/scripts/init.sh b/apps/speedtest-tracker/0.18.7/scripts/init.sh deleted file mode 100644 index 5a4fb865d..000000000 --- a/apps/speedtest-tracker/0.18.7/scripts/init.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - keys - mkdir -p "$SP_TRACKER_ROOT_PATH" - - mkdir -p "$SP_TRACKER_ROOT_PATH/conf" - mkdir -p "$SP_TRACKER_ROOT_PATH/conf/keys" - - chmod $PUID:$PGID -R "$SP_TRACKER_ROOT_PATH" - - echo "Check Finish." - -else - echo ".env not found." -fi diff --git a/apps/speedtest-tracker/0.19.0/data.yml b/apps/speedtest-tracker/0.19.0/data.yml deleted file mode 100644 index afba7aa8a..000000000 --- a/apps/speedtest-tracker/0.19.0/data.yml +++ /dev/null @@ -1,176 +0,0 @@ -additionalProperties: - formFields: - - default: "lscr.io/linuxserver/speedtest-tracker:0.19.0" - edit: true - envKey: SPEED_TEST_IMAGE - labelEn: Image source - labelZh: 镜像源 - required: true - type: select - values: - - label: "LinuxServer" - value: "lscr.io/linuxserver/speedtest-tracker:0.19.0" - - label: "GitHub" - value: "ghcr.io/alexjustesen/speedtest-tracker:v0.19.0" - - default: "/home/speedtest-tracker" - edit: true - envKey: SP_TRACKER_ROOT_PATH - labelEn: Data persistence root path - labelZh: 数据持久化 根路径 - required: true - type: text - - default: 8080 - edit: true - envKey: PANEL_APP_PORT_HTTP - labelEn: Server port - labelZh: Web 服务端口 - required: true - rule: paramPort - type: number - - default: 8443 - edit: true - envKey: PANEL_APP_PORT_HTTPS - labelEn: Server port - labelZh: SSL 服务端口 - required: true - rule: paramPort - type: number - - default: "Asia/Shanghai" - edit: true - envKey: SP_TRACKER_TZ - labelEn: Timezone - labelZh: 时区 - required: false - type: text - - default: "sqlite" - edit: true - envKey: SP_TRACKER_DB_TYPE - labelEn: Database type - labelZh: 数据库驱动类型 - required: true - type: select - values: - - label: MySQL (MariaDB) - value: "mysql" - - label: SQLite - value: "sqlite" - - label: PostgreSQL - value: "pgsql" - - default: "localhost" - edit: true - envKey: SP_TRACKER_DB_HOST - labelEn: Database host IP - labelZh: 数据库主机IP - required: false - type: text - - default: 3306 - edit: true - envKey: SP_TRACKER_DB_PORT - labelEn: Database Port (default 3306) - labelZh: 数据库端口 (默认3306) - required: false - rule: paramPort - type: number - - default: "speedtest_tracker" - edit: true - envKey: SP_TRACKER_DB_USER - labelEn: Database Connection Username - labelZh: 数据库 用户名 - required: false - type: text - - default: "speedtest_tracker" - edit: true - envKey: SP_TRACKER_DB_PASSWORD - labelEn: Database Connection Password - labelZh: 数据库 用户名密码 - required: false - type: password - - default: "speedtest_tracker" - edit: true - envKey: MYSQL_SERVICE_DB_NAME - labelEn: Database Name - labelZh: 数据库名称 - required: false - type: text - - default: "" - edit: true - envKey: SP_TRACKER_APP_KEY - labelEn: Application Key - labelZh: 加密存储数据的应用程序密钥 (Base64 开头) - required: false - type: text - - default: 1000 - edit: true - envKey: PUID - labelEn: User ID - labelZh: 用户ID - required: false - type: number - - default: 1000 - edit: true - envKey: PGID - labelEn: Group ID - labelZh: 组ID - required: false - type: number - - default: "smtp" - edit: true - envKey: MAIL_MAILER - labelEn: Mailer - labelZh: 协议 (SMTP) - required: false - type: text - - default: "smtp.163.com" - edit: true - envKey: MAIL_HOST - labelEn: Mail Host - labelZh: 邮件服务器地址 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_USERNAME - labelEn: Mail Username - labelZh: 邮件用户名 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_PASSWORD - labelEn: Mail Password - labelZh: 邮件账户密码 (SMTP) - required: false - type: text - - default: "ssl" - edit: true - envKey: MAIL_ENCRYPTION - labelEn: Mail Encryption - labelZh: 邮件加密方式 (SMTP) - required: false - type: select - values: - - label: "SSL" - value: "ssl" - - label: "TLS" - value: "tls" - - default: "" - edit: true - envKey: MAIL_FROM_ADDRESS - labelEn: Mail From Address - labelZh: 邮件发送地址 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: MAIL_FROM_NAME - labelEn: Mail From Name - labelZh: 邮件发送者名称 (SMTP) - required: false - type: text - - default: "" - edit: true - envKey: TELEGRAM_BOT_TOKEN - labelEn: Bot Token ID (Telegram Notification) - labelZh: 机器人的令牌 ID (通知 Telegram) - required: false - type: text diff --git a/apps/speedtest-tracker/0.19.0/docker-compose.yml b/apps/speedtest-tracker/0.19.0/docker-compose.yml deleted file mode 100644 index 552f67782..000000000 --- a/apps/speedtest-tracker/0.19.0/docker-compose.yml +++ /dev/null @@ -1,34 +0,0 @@ -networks: - 1panel-network: - external: true - -services: - speedtest-tracker: - image: ${SPEED_TEST_IMAGE} - container_name: ${CONTAINER_NAME} - labels: - createdBy: "Apps" - restart: always - networks: - - 1panel-network - ports: - - ${PANEL_APP_PORT_HTTP}:80 - - ${PANEL_APP_PORT_HTTPS}:443 - environment: - - PUID=${PUID:-1000} - - PGID=${PGID:-1000} - - TZ=${SP_TRACKER_TZ:-Asia/Shanghai} - - DB_CONNECTION=${SP_TRACKER_DB_TYPE:-sqlite} - - DB_HOST=${SP_TRACKER_DB_HOST} - - DB_PORT=${SP_TRACKER_DB_PORT} - - DB_DATABASE=${MYSQL_SERVICE_DB_NAME} - - DB_USERNAME=${SP_TRACKER_DB_USER} - - DB_PASSWORD=${SP_TRACKER_DB_PASSWORD} - volumes: - - ${SP_TRACKER_ROOT_PATH}/config:/config - healthcheck: - test: curl -fSs APP_URL/api/healthcheck || exit 1 - interval: 10s - retries: 3 - start_period: 30s - timeout: 10s diff --git a/apps/speedtest-tracker/0.19.0/scripts/init.sh b/apps/speedtest-tracker/0.19.0/scripts/init.sh deleted file mode 100644 index 5a4fb865d..000000000 --- a/apps/speedtest-tracker/0.19.0/scripts/init.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -if [[ -f .env ]]; then - source .env - - keys - mkdir -p "$SP_TRACKER_ROOT_PATH" - - mkdir -p "$SP_TRACKER_ROOT_PATH/conf" - mkdir -p "$SP_TRACKER_ROOT_PATH/conf/keys" - - chmod $PUID:$PGID -R "$SP_TRACKER_ROOT_PATH" - - echo "Check Finish." - -else - echo ".env not found." -fi diff --git a/apps/speedtest-tracker/0.24.3/data.yml b/apps/speedtest-tracker/0.24.3/data.yml new file mode 100644 index 000000000..d2a06f24d --- /dev/null +++ b/apps/speedtest-tracker/0.24.3/data.yml @@ -0,0 +1,221 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_DB_HOST + required: true + type: service + default: postgresql + edit: true + envKey: PANEL_DB_TYPE + labelZh: 数据库 服务 (前置检查) + labelEn: Database Service (Pre-check) + required: true + type: apps + values: + - label: PostgreSQL + value: postgresql + - label: MySQL + value: mysql + - label: MariaDB + value: mariadb + - label: Percona + value: percona + - default: "/home/speedtest-tracker" + edit: true + envKey: SPEEDTEST_TRACKER_ROOT_PATH + labelEn: Data persistence root path + labelZh: 数据持久化 根路径 + required: true + type: text + - default: "host" + edit: true + envKey: NETWORK_MODE + labelEn: Drive path + labelZh: 网络模式 + required: true + type: select + values: + - label: 主机网络模式 + value: "host" + - label: 桥接网络模式 + value: "bridge" + - label: 无网络模式 + value: "none" + - label: 1panel-network + value: "1panel-network" + - default: 8080 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Server port + labelZh: Web 服务端口 + required: true + rule: paramPort + type: number + - default: "base64:f0Ivk1nHd3QwXtR55WKC4fcc7QjrxxTnkiB02ipdl60=" + edit: true + envKey: APP_KEY + labelZh: 应用密钥 (官网获取) + labelEn: App key (Get from official website) + required: true + type: text + - default: "SpeedTest Tracker" + edit: true + envKey: APP_NAME + labelZh: 应用名称 + labelEn: App Name + required: true + type: text + - default: "http://127.0.0.1:8080" + edit: true + envKey: APP_URL + labelZh: 应用访问地址 + labelEn: App URL + required: true + type: text + - default: postgres + edit: true + envKey: DB_CONNECTION + labelZh: 数据库 类型 + labelEn: Database Type + required: true + type: select + values: + - label: PostgreSQL + value: postgres + - label: MySQL (MariaDB, Percona) + value: mysql + - default: "127.0.0.1" + edit: true + envKey: DB_HOST + labelZh: 数据库 主机地址 + labelEn: Database Host + required: true + type: text + - default: 5432 + edit: true + envKey: DB_PORT + labelZh: 数据库 端口 + labelEn: Database Port + required: true + rule: paramPort + type: number + - default: "speedtest-tracker" + edit: true + envKey: DB_USERNAME + labelZh: 数据库 用户名 + labelEn: Database User + required: true + type: text + - default: "" + edit: true + envKey: DB_PASSWORD + labelEn: Database Password + labelZh: 数据库 密码 + random: true + required: true + rule: paramComplexity + type: password + - default: "speedtest-tracker" + edit: true + envKey: DB_DATABASE + labelZh: 数据库 名称 + labelEn: Database Name + required: true + type: text + - default: 0 + edit: true + envKey: PRUNE_RESULTS_OLDER_THAN + labelZh: 测试结果保留天数 + labelEn: Prune results older than + required: true + type: text + - default: "0 */6 * * *" + edit: true + envKey: SPEEDTEST_SCHEDULE + labelZh: 测试计划任务 + labelEn: Speedtest schedule + required: false + type: text + - default: "" + edit: true + envKey: SPEEDTEST_SERVERS + labelZh: 指定测试服务器 + labelEn: Specify servers + required: false + type: text + - default: "smtp" + edit: true + envKey: MAIL_MAILER + labelZh: 邮件 协议 + labelEn: Mail mailer + required: true + type: text + - default: "smtp.gmail.com" + edit: true + envKey: MAIL_HOST + labelZh: 邮件 主机地址 + labelEn: Mail host + required: true + type: text + - default: 465 + edit: true + envKey: MAIL_PORT + labelZh: 邮件 主机端口 + labelEn: Mail port + required: true + type: number + - default: "" + edit: true + envKey: MAIL_USERNAME + labelZh: 邮件 鉴权用户名 + labelEn: Mail username + required: false + type: text + - default: "" + edit: true + envKey: MAIL_PASSWORD + labelZh: 邮件 鉴权密码 + labelEn: Mail password + required: false + type: text + - default: "" + edit: true + envKey: MAIL_FROM_ADDRESS + labelZh: 邮件 发件地址 + labelEn: Mail from address + required: false + type: text + - default: "Speedtest Tracker" + edit: true + envKey: MAIL_FROM_NAME + labelZh: 邮件 发件名称 + labelEn: Mail from name + required: true + type: text + - default: "tls" + edit: true + envKey: MAIL_ENCRYPTION + labelZh: 邮件 加密方式 + labelEn: Mail encryption + required: true + type: text + - default: "" + edit: true + envKey: TELEGRAM_BOT_TOKEN + labelZh: Telegram 机器人令牌 + labelEn: Telegram bot token + required: false + type: text + - default: "file" + edit: true + envKey: CACHE_DRIVER + labelZh: 缓存 驱动 + labelEn: Cache driver + required: true + type: select + values: + - label: 文件缓存 + value: "file" + - label: 数据库缓存 + value: "database" diff --git a/apps/speedtest-tracker/0.24.3/docker-compose.yml b/apps/speedtest-tracker/0.24.3/docker-compose.yml new file mode 100644 index 000000000..5dad944dd --- /dev/null +++ b/apps/speedtest-tracker/0.24.3/docker-compose.yml @@ -0,0 +1,24 @@ +networks: + 1panel-network: + external: true + +services: + speedtest-tracker: + image: linuxserver/speedtest-tracker:0.24.3 + container_name: ${CONTAINER_NAME} + labels: + createdBy: "Apps" + restart: always + network_mode: ${NETWORK_MODE} + ports: + - ${PANEL_APP_PORT_HTTP}:80 + env_file: + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} + - ${ENV_FILE:-/etc/1panel/envs/default.env} + volumes: + - ${SPEEDTEST_TRACKER_ROOT_PATH}/config:/config + environment: + - PUID=1000 + - PGID=1000 + - TZ=Asia/Shanghai + - DISPLAY_TIMEZONE=Asia/Shanghai diff --git a/apps/speedtest-tracker/0.24.3/envs/default.env b/apps/speedtest-tracker/0.24.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/speedtest-tracker/0.24.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/speedtest-tracker/0.24.3/envs/global.env b/apps/speedtest-tracker/0.24.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/speedtest-tracker/0.24.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/speedtest-tracker/0.24.3/scripts/init.sh b/apps/speedtest-tracker/0.24.3/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/speedtest-tracker/0.24.3/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/speedtest-tracker/0.18.7/scripts/upgrade.sh b/apps/speedtest-tracker/0.24.3/scripts/uninstall.sh similarity index 50% rename from apps/speedtest-tracker/0.18.7/scripts/upgrade.sh rename to apps/speedtest-tracker/0.24.3/scripts/uninstall.sh index b4e373186..c86c4fbca 100644 --- a/apps/speedtest-tracker/0.18.7/scripts/upgrade.sh +++ b/apps/speedtest-tracker/0.24.3/scripts/uninstall.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [[ -f .env ]]; then +if [ -f .env ]; then source .env echo "Check Finish." else - echo ".env not found." + echo "Error: .env file not found." fi diff --git a/apps/speedtest-tracker/0.24.3/scripts/upgrade.sh b/apps/speedtest-tracker/0.24.3/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/speedtest-tracker/0.24.3/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/speedtest-tracker/README.md b/apps/speedtest-tracker/README.md index 8db74aca2..c41c5250c 100644 --- a/apps/speedtest-tracker/README.md +++ b/apps/speedtest-tracker/README.md @@ -1,12 +1,20 @@ # Speedtest Tracker -Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查。 - Speedtest Tracker 的主要用例是建立互联网性能的历史记录，以便您在未收到 ISP 公布的费率时收到通知。 +![Speedtest Tracker](https://file.lifebus.top/imgs/speedtest_tracker_cover.png) + +Speedtest Tracker 是一款自托管互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查。 + ![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue) -## 默认账户 +## 应用说明 + +Speedtest Tracker 是一个自托管的互联网性能跟踪应用程序，可针对 Ookla 的 Speedtest 服务运行速度测试检查。 + +由于 Speedtest 服务主要节点位于国外，所以在国内使用时可能会有一些问题，但是在国外使用时，Speedtest Tracker 是一个非常好的选择。 + +## 安装说明 > admin@example.com > diff --git a/apps/speedtest-tracker/data.yml b/apps/speedtest-tracker/data.yml index 1b9ea5662..4930f4a35 100644 --- a/apps/speedtest-tracker/data.yml +++ b/apps/speedtest-tracker/data.yml @@ -1,11 +1,13 @@ additionalProperties: key: speedtest-tracker - name: SpeedTest-Tracker + name: SpeedTest Tracker tags: - - Tool + - WebSite + - Middleware + - Local shortDescZh: 托管互联网性能跟踪应用程序 shortDescEn: Hosted internet performance tracking application - type: tool + type: website crossVersionUpdate: true limit: 0 website: https://docs.speedtest-tracker.dev/ diff --git a/apps/speedtest/5.4.1/docker-compose.yml b/apps/speedtest/5.4.1/docker-compose.yml index c562e975d..6dbf5762f 100644 --- a/apps/speedtest/5.4.1/docker-compose.yml +++ b/apps/speedtest/5.4.1/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SPEED_TEST_ROOT_PATH}/database:/database diff --git a/apps/speedtest/5.4.1/envs/default.env b/apps/speedtest/5.4.1/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/speedtest/5.4.1/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/speedtest/5.4.1/envs/global.env b/apps/speedtest/5.4.1/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/speedtest/5.4.1/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/speedtest/5.4.1/scripts/init.sh b/apps/speedtest/5.4.1/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/speedtest/5.4.1/scripts/init.sh +++ b/apps/speedtest/5.4.1/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/speedtest/5.4.1/scripts/upgrade.sh b/apps/speedtest/5.4.1/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/speedtest/5.4.1/scripts/upgrade.sh +++ b/apps/speedtest/5.4.1/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/stream-rec-backend/0.7.2/docker-compose.yml b/apps/stream-rec-backend/0.7.2/docker-compose.yml index eb39283ce..71e52df91 100644 --- a/apps/stream-rec-backend/0.7.2/docker-compose.yml +++ b/apps/stream-rec-backend/0.7.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:12555 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records diff --git a/apps/stream-rec-backend/0.7.2/envs/default.env b/apps/stream-rec-backend/0.7.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/stream-rec-backend/0.7.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/stream-rec-backend/0.7.2/envs/global.env b/apps/stream-rec-backend/0.7.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/stream-rec-backend/0.7.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/stream-rec-backend/0.7.2/scripts/init.sh b/apps/stream-rec-backend/0.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/stream-rec-backend/0.7.2/scripts/init.sh +++ b/apps/stream-rec-backend/0.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh b/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh +++ b/apps/stream-rec-backend/0.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/stream-rec-frontend/0.7.2/docker-compose.yml b/apps/stream-rec-frontend/0.7.2/docker-compose.yml index 8641974a6..1d695a01a 100644 --- a/apps/stream-rec-frontend/0.7.2/docker-compose.yml +++ b/apps/stream-rec-frontend/0.7.2/docker-compose.yml @@ -14,5 +14,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:15275 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/apps/stream-rec-frontend/0.7.2/envs/default.env b/apps/stream-rec-frontend/0.7.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/stream-rec-frontend/0.7.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/stream-rec-frontend/0.7.2/envs/global.env b/apps/stream-rec-frontend/0.7.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/stream-rec-frontend/0.7.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/stream-rec-frontend/0.7.2/scripts/init.sh b/apps/stream-rec-frontend/0.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/stream-rec-frontend/0.7.2/scripts/init.sh +++ b/apps/stream-rec-frontend/0.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh b/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh +++ b/apps/stream-rec-frontend/0.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/stream-rec/0.7.2/docker-compose.yml b/apps/stream-rec/0.7.2/docker-compose.yml index 29a492fa7..8648c2a9b 100644 --- a/apps/stream-rec/0.7.2/docker-compose.yml +++ b/apps/stream-rec/0.7.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_API}:12555 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${STREAM_REC_ROOT_PATH}/records:/opt/records @@ -37,5 +37,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:15275 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/apps/stream-rec/0.7.2/envs/default.env b/apps/stream-rec/0.7.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/stream-rec/0.7.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/stream-rec/0.7.2/envs/global.env b/apps/stream-rec/0.7.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/stream-rec/0.7.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/stream-rec/0.7.2/scripts/init.sh b/apps/stream-rec/0.7.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/stream-rec/0.7.2/scripts/init.sh +++ b/apps/stream-rec/0.7.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/stream-rec/0.7.2/scripts/upgrade.sh b/apps/stream-rec/0.7.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/stream-rec/0.7.2/scripts/upgrade.sh +++ b/apps/stream-rec/0.7.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/sun-panel/1.6.0/docker-compose.yml b/apps/sun-panel/1.6.0/docker-compose.yml index ddd37273d..01637ede1 100644 --- a/apps/sun-panel/1.6.0/docker-compose.yml +++ b/apps/sun-panel/1.6.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3002 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SUN_PANEL_ROOT_PATH}/conf:/app/conf diff --git a/apps/sun-panel/1.6.0/envs/default.env b/apps/sun-panel/1.6.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/sun-panel/1.6.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/sun-panel/1.6.0/envs/global.env b/apps/sun-panel/1.6.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/sun-panel/1.6.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/sun-panel/1.6.0/scripts/init.sh b/apps/sun-panel/1.6.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/sun-panel/1.6.0/scripts/init.sh +++ b/apps/sun-panel/1.6.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/sun-panel/1.6.0/scripts/upgrade.sh b/apps/sun-panel/1.6.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/sun-panel/1.6.0/scripts/upgrade.sh +++ b/apps/sun-panel/1.6.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/synapse-admin/0.10.3/docker-compose.yml b/apps/synapse-admin/0.10.3/docker-compose.yml index 4b1e8d832..c02c0b35e 100644 --- a/apps/synapse-admin/0.10.3/docker-compose.yml +++ b/apps/synapse-admin/0.10.3/docker-compose.yml @@ -14,5 +14,5 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} diff --git a/apps/synapse-admin/0.10.3/envs/default.env b/apps/synapse-admin/0.10.3/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/synapse-admin/0.10.3/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/synapse-admin/0.10.3/envs/global.env b/apps/synapse-admin/0.10.3/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/synapse-admin/0.10.3/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/synapse-admin/0.10.3/scripts/init.sh b/apps/synapse-admin/0.10.3/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/synapse-admin/0.10.3/scripts/init.sh +++ b/apps/synapse-admin/0.10.3/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/synapse-admin/0.10.3/scripts/upgrade.sh b/apps/synapse-admin/0.10.3/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/synapse-admin/0.10.3/scripts/upgrade.sh +++ b/apps/synapse-admin/0.10.3/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/synapse/1.119.0/scripts/init.sh b/apps/synapse/1.119.0/scripts/init.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/synapse/1.119.0/scripts/init.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/synapse/1.119.0/scripts/upgrade.sh b/apps/synapse/1.119.0/scripts/upgrade.sh deleted file mode 100644 index 77b849120..000000000 --- a/apps/synapse/1.119.0/scripts/upgrade.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ -f .env ]; then - source .env - - # setup-1 add default values - CURRENT_DIR=$(pwd) - sed -i '/^ENV_FILE=/d' .env - echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env - - echo "Check Finish." - -else - echo "Error: .env file not found." -fi diff --git a/apps/synapse/1.119.0/data.yml b/apps/synapse/1.120.0/data.yml similarity index 100% rename from apps/synapse/1.119.0/data.yml rename to apps/synapse/1.120.0/data.yml diff --git a/apps/synapse/1.119.0/docker-compose.yml b/apps/synapse/1.120.0/docker-compose.yml similarity index 80% rename from apps/synapse/1.119.0/docker-compose.yml rename to apps/synapse/1.120.0/docker-compose.yml index 2e2d05808..8fff5a33d 100644 --- a/apps/synapse/1.119.0/docker-compose.yml +++ b/apps/synapse/1.120.0/docker-compose.yml @@ -4,13 +4,13 @@ networks: services: synapse-init: - image: matrixdotorg/synapse:v1.119.0 + image: matrixdotorg/synapse:v1.120.0 container_name: init-${CONTAINER_NAME} entrypoint: - /start.py - generate env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SYNAPSE_ROOT_PATH}/data:/data @@ -22,7 +22,7 @@ services: - SYNAPSE_NO_TLS=true - SYNAPSE_HTTP_PORT=8008 synapse: - image: matrixdotorg/synapse:v1.119.0 + image: matrixdotorg/synapse:v1.120.0 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -32,7 +32,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8008 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${SYNAPSE_ROOT_PATH}/data:/data diff --git a/apps/synapse/1.120.0/envs/default.env b/apps/synapse/1.120.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/synapse/1.120.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/synapse/1.120.0/envs/global.env b/apps/synapse/1.120.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/synapse/1.120.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/synapse/1.120.0/scripts/init.sh b/apps/synapse/1.120.0/scripts/init.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/synapse/1.120.0/scripts/init.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/speedtest-tracker/0.19.0/scripts/upgrade.sh b/apps/synapse/1.120.0/scripts/uninstall.sh similarity index 50% rename from apps/speedtest-tracker/0.19.0/scripts/upgrade.sh rename to apps/synapse/1.120.0/scripts/uninstall.sh index b4e373186..c86c4fbca 100644 --- a/apps/speedtest-tracker/0.19.0/scripts/upgrade.sh +++ b/apps/synapse/1.120.0/scripts/uninstall.sh @@ -1,10 +1,10 @@ #!/bin/bash -if [[ -f .env ]]; then +if [ -f .env ]; then source .env echo "Check Finish." else - echo ".env not found." + echo "Error: .env file not found." fi diff --git a/apps/synapse/1.120.0/scripts/upgrade.sh b/apps/synapse/1.120.0/scripts/upgrade.sh new file mode 100644 index 000000000..07fb8c3fe --- /dev/null +++ b/apps/synapse/1.120.0/scripts/upgrade.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +if [ -f .env ]; then + source .env + + # setup-1 add default values + CURRENT_DIR=$(pwd) + sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env + echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env + + echo "Check Finish." + +else + echo "Error: .env file not found." +fi diff --git a/apps/tangsengdaodao/1.5/docker-compose.yml b/apps/tangsengdaodao/1.5/docker-compose.yml index 0c119c744..011c18019 100644 --- a/apps/tangsengdaodao/1.5/docker-compose.yml +++ b/apps/tangsengdaodao/1.5/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_WK_WS}:5200 - ${PANEL_APP_PORT_WK_WEB_SERVER}:5300 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TANGSENGDAODAO_ROOT_PATH}/wukongim:/root/wukongim @@ -40,7 +40,7 @@ services: ports: - ${PANEL_APP_PORT_TS_APP_HTTP}:8090 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} command: "api" healthcheck: @@ -72,7 +72,7 @@ services: ports: - ${PANEL_APP_PORT_TS_APP_WEB}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - API_URL=http://${WK_EXTERNAL_IP}:${PANEL_APP_PORT_TS_APP_HTTP}/ @@ -87,7 +87,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - API_URL=http://${WK_EXTERNAL_IP}:${PANEL_APP_PORT_TS_APP_HTTP}/ diff --git a/apps/tangsengdaodao/1.5/envs/default.env b/apps/tangsengdaodao/1.5/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/tangsengdaodao/1.5/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/tangsengdaodao/1.5/envs/global.env b/apps/tangsengdaodao/1.5/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/tangsengdaodao/1.5/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/tangsengdaodao/1.5/scripts/init.sh b/apps/tangsengdaodao/1.5/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/tangsengdaodao/1.5/scripts/init.sh +++ b/apps/tangsengdaodao/1.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/tangsengdaodao/1.5/scripts/upgrade.sh b/apps/tangsengdaodao/1.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/tangsengdaodao/1.5/scripts/upgrade.sh +++ b/apps/tangsengdaodao/1.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/teemii/0.8.2/docker-compose.yml b/apps/teemii/0.8.2/docker-compose.yml index 1cbddee8d..1fe8c51e1 100644 --- a/apps/teemii/0.8.2/docker-compose.yml +++ b/apps/teemii/0.8.2/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - VITE_APP_PORT=80 @@ -27,7 +27,7 @@ services: networks: - 1panel-network env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TEEMII_ROOT_PATH}/data:/data diff --git a/apps/teemii/0.8.2/envs/default.env b/apps/teemii/0.8.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/teemii/0.8.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/teemii/0.8.2/envs/global.env b/apps/teemii/0.8.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/teemii/0.8.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/teemii/0.8.2/scripts/init.sh b/apps/teemii/0.8.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/teemii/0.8.2/scripts/init.sh +++ b/apps/teemii/0.8.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/teemii/0.8.2/scripts/upgrade.sh b/apps/teemii/0.8.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/teemii/0.8.2/scripts/upgrade.sh +++ b/apps/teemii/0.8.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/telegram-bot-api/8.0/docker-compose.yml b/apps/telegram-bot-api/8.0/docker-compose.yml index 9a80ed91b..8499c31f7 100644 --- a/apps/telegram-bot-api/8.0/docker-compose.yml +++ b/apps/telegram-bot-api/8.0/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_HTTPS}:8081 - ${PANEL_APP_PORT_HTTP}:8082 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TELEGRAM_BOT_API_ROOT_PATH}/data:/var/lib/telegram-bot-api diff --git a/apps/telegram-bot-api/8.0/envs/default.env b/apps/telegram-bot-api/8.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/telegram-bot-api/8.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/telegram-bot-api/8.0/envs/global.env b/apps/telegram-bot-api/8.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/telegram-bot-api/8.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/telegram-bot-api/8.0/scripts/init.sh b/apps/telegram-bot-api/8.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/telegram-bot-api/8.0/scripts/init.sh +++ b/apps/telegram-bot-api/8.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/telegram-bot-api/8.0/scripts/upgrade.sh b/apps/telegram-bot-api/8.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/telegram-bot-api/8.0/scripts/upgrade.sh +++ b/apps/telegram-bot-api/8.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/traccar/6.5/docker-compose.yml b/apps/traccar/6.5/docker-compose.yml index 552ee1022..a5ffdd8eb 100644 --- a/apps/traccar/6.5/docker-compose.yml +++ b/apps/traccar/6.5/docker-compose.yml @@ -15,7 +15,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8082 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TRACCAR_ROOT_PATH}/logs:/opt/traccar/logs:rw diff --git a/apps/traccar/6.5/envs/default.env b/apps/traccar/6.5/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/traccar/6.5/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/traccar/6.5/envs/global.env b/apps/traccar/6.5/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/traccar/6.5/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/traccar/6.5/scripts/init.sh b/apps/traccar/6.5/scripts/init.sh index bbb4e0793..7f45cbee6 100644 --- a/apps/traccar/6.5/scripts/init.sh +++ b/apps/traccar/6.5/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env cp conf/traccar.xml "${TRACCAR_ROOT_PATH}/traccar.xml" diff --git a/apps/traccar/6.5/scripts/upgrade.sh b/apps/traccar/6.5/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/traccar/6.5/scripts/upgrade.sh +++ b/apps/traccar/6.5/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/transmission/4.0.6/docker-compose.yml b/apps/transmission/4.0.6/docker-compose.yml index 7278403ab..dbe20aae5 100644 --- a/apps/transmission/4.0.6/docker-compose.yml +++ b/apps/transmission/4.0.6/docker-compose.yml @@ -15,7 +15,7 @@ services: - ${PANEL_APP_PORT_TORRENTING} - ${PANEL_APP_PORT_TORRENTING}/udp env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${TRANSMISSION_ROOT_PATH}/config:/config diff --git a/apps/transmission/4.0.6/envs/default.env b/apps/transmission/4.0.6/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/transmission/4.0.6/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/transmission/4.0.6/envs/global.env b/apps/transmission/4.0.6/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/transmission/4.0.6/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/transmission/4.0.6/scripts/init.sh b/apps/transmission/4.0.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/transmission/4.0.6/scripts/init.sh +++ b/apps/transmission/4.0.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/transmission/4.0.6/scripts/upgrade.sh b/apps/transmission/4.0.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/transmission/4.0.6/scripts/upgrade.sh +++ b/apps/transmission/4.0.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/umami-mysql/2.14.0/docker-compose.yml b/apps/umami-mysql/2.14.0/docker-compose.yml index 79466afec..c6c469c92 100644 --- a/apps/umami-mysql/2.14.0/docker-compose.yml +++ b/apps/umami-mysql/2.14.0/docker-compose.yml @@ -16,7 +16,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DISABLE_TELEMETRY = 1 diff --git a/apps/umami-mysql/2.14.0/envs/default.env b/apps/umami-mysql/2.14.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/umami-mysql/2.14.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/umami-mysql/2.14.0/envs/global.env b/apps/umami-mysql/2.14.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/umami-mysql/2.14.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/umami-mysql/2.14.0/scripts/init.sh b/apps/umami-mysql/2.14.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/umami-mysql/2.14.0/scripts/init.sh +++ b/apps/umami-mysql/2.14.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/umami-mysql/2.14.0/scripts/upgrade.sh b/apps/umami-mysql/2.14.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/umami-mysql/2.14.0/scripts/upgrade.sh +++ b/apps/umami-mysql/2.14.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/umami/2.14.0/docker-compose.yml b/apps/umami/2.14.0/docker-compose.yml index b38c9d802..bfcc4cb06 100644 --- a/apps/umami/2.14.0/docker-compose.yml +++ b/apps/umami/2.14.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3000 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} environment: - DISABLE_TELEMETRY = 1 diff --git a/apps/umami/2.14.0/envs/default.env b/apps/umami/2.14.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/umami/2.14.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/umami/2.14.0/envs/global.env b/apps/umami/2.14.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/umami/2.14.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/umami/2.14.0/scripts/init.sh b/apps/umami/2.14.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/umami/2.14.0/scripts/init.sh +++ b/apps/umami/2.14.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/umami/2.14.0/scripts/upgrade.sh b/apps/umami/2.14.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/umami/2.14.0/scripts/upgrade.sh +++ b/apps/umami/2.14.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/uptime-kuma/1.23.15/docker-compose.yml b/apps/uptime-kuma/1.23.15/docker-compose.yml index fb9345b3c..bf7f15342 100644 --- a/apps/uptime-kuma/1.23.15/docker-compose.yml +++ b/apps/uptime-kuma/1.23.15/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data diff --git a/apps/uptime-kuma/1.23.15/envs/default.env b/apps/uptime-kuma/1.23.15/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/uptime-kuma/1.23.15/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/uptime-kuma/1.23.15/envs/global.env b/apps/uptime-kuma/1.23.15/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/uptime-kuma/1.23.15/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/uptime-kuma/1.23.15/scripts/init.sh b/apps/uptime-kuma/1.23.15/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/uptime-kuma/1.23.15/scripts/init.sh +++ b/apps/uptime-kuma/1.23.15/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/uptime-kuma/1.23.15/scripts/upgrade.sh b/apps/uptime-kuma/1.23.15/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/uptime-kuma/1.23.15/scripts/upgrade.sh +++ b/apps/uptime-kuma/1.23.15/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/uptime-kuma/2.0.0/docker-compose.yml b/apps/uptime-kuma/2.0.0/docker-compose.yml index 09a1ef248..79d81536c 100644 --- a/apps/uptime-kuma/2.0.0/docker-compose.yml +++ b/apps/uptime-kuma/2.0.0/docker-compose.yml @@ -14,7 +14,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:3001 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${UPTIME_KUMA_ROOT_PATH}/data:/app/data diff --git a/apps/uptime-kuma/2.0.0/envs/default.env b/apps/uptime-kuma/2.0.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/uptime-kuma/2.0.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/uptime-kuma/2.0.0/envs/global.env b/apps/uptime-kuma/2.0.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/uptime-kuma/2.0.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/uptime-kuma/2.0.0/scripts/init.sh b/apps/uptime-kuma/2.0.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/uptime-kuma/2.0.0/scripts/init.sh +++ b/apps/uptime-kuma/2.0.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/uptime-kuma/2.0.0/scripts/upgrade.sh b/apps/uptime-kuma/2.0.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/uptime-kuma/2.0.0/scripts/upgrade.sh +++ b/apps/uptime-kuma/2.0.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/watchyourlan/2.0.4/docker-compose.yml b/apps/watchyourlan/2.0.4/docker-compose.yml index e477e30a0..aaf0dfe44 100644 --- a/apps/watchyourlan/2.0.4/docker-compose.yml +++ b/apps/watchyourlan/2.0.4/docker-compose.yml @@ -13,7 +13,7 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:8840 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WATCHYOURLAN_ROOT_PATH}/data:/data/WatchYourLAN diff --git a/apps/watchyourlan/2.0.4/envs/default.env b/apps/watchyourlan/2.0.4/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/watchyourlan/2.0.4/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/watchyourlan/2.0.4/envs/global.env b/apps/watchyourlan/2.0.4/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/watchyourlan/2.0.4/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/watchyourlan/2.0.4/scripts/init.sh b/apps/watchyourlan/2.0.4/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/watchyourlan/2.0.4/scripts/init.sh +++ b/apps/watchyourlan/2.0.4/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/watchyourlan/2.0.4/scripts/upgrade.sh b/apps/watchyourlan/2.0.4/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/watchyourlan/2.0.4/scripts/upgrade.sh +++ b/apps/watchyourlan/2.0.4/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/windows/4.05/docker-compose.yml b/apps/windows/4.05/docker-compose.yml index 2cb693ef8..d253f0cc0 100644 --- a/apps/windows/4.05/docker-compose.yml +++ b/apps/windows/4.05/docker-compose.yml @@ -29,7 +29,7 @@ services: # - /dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools # - /dev/video11:/dev/video11 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WINDOWS_STORAGE_ROOT_PATH}/storage:/storage diff --git a/apps/windows/4.05/envs/default.env b/apps/windows/4.05/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/windows/4.05/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/windows/4.05/envs/global.env b/apps/windows/4.05/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/windows/4.05/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/windows/4.05/scripts/init.sh b/apps/windows/4.05/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/windows/4.05/scripts/init.sh +++ b/apps/windows/4.05/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/windows/4.05/scripts/upgrade.sh b/apps/windows/4.05/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/windows/4.05/scripts/upgrade.sh +++ b/apps/windows/4.05/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/wiseflow/0.3.0/docker-compose.yml b/apps/wiseflow/0.3.0/docker-compose.yml index 57bb24358..4759d67a9 100644 --- a/apps/wiseflow/0.3.0/docker-compose.yml +++ b/apps/wiseflow/0.3.0/docker-compose.yml @@ -17,7 +17,7 @@ services: - ${PANEL_APP_PORT_HTTP}:8090 - ${PANEL_APP_PORT_BACKEND}:8077 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WISEFLOW_ROOT_PATH}/pb_data:/app/pb/pb_data diff --git a/apps/wiseflow/0.3.0/envs/default.env b/apps/wiseflow/0.3.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/wiseflow/0.3.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/wiseflow/0.3.0/envs/global.env b/apps/wiseflow/0.3.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/wiseflow/0.3.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/wiseflow/0.3.0/scripts/init.sh b/apps/wiseflow/0.3.0/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/wiseflow/0.3.0/scripts/init.sh +++ b/apps/wiseflow/0.3.0/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/wiseflow/0.3.0/scripts/upgrade.sh b/apps/wiseflow/0.3.0/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/wiseflow/0.3.0/scripts/upgrade.sh +++ b/apps/wiseflow/0.3.0/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/wukongim/1.2.6/docker-compose.yml b/apps/wukongim/1.2.6/docker-compose.yml index f4f111213..5c98da8e0 100644 --- a/apps/wukongim/1.2.6/docker-compose.yml +++ b/apps/wukongim/1.2.6/docker-compose.yml @@ -18,7 +18,7 @@ services: - ${PANEL_APP_PORT_WK_WS}:5200 - ${PANEL_APP_PORT_WK_DEMO_SERVER}:5172 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${WUKONGIM_ROOT_PATH}/wukongim:/root/wukongim diff --git a/apps/wukongim/1.2.6/envs/default.env b/apps/wukongim/1.2.6/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/wukongim/1.2.6/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/wukongim/1.2.6/envs/global.env b/apps/wukongim/1.2.6/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/wukongim/1.2.6/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/wukongim/1.2.6/scripts/init.sh b/apps/wukongim/1.2.6/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/wukongim/1.2.6/scripts/init.sh +++ b/apps/wukongim/1.2.6/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/wukongim/1.2.6/scripts/upgrade.sh b/apps/wukongim/1.2.6/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/wukongim/1.2.6/scripts/upgrade.sh +++ b/apps/wukongim/1.2.6/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/xunlei-cnk3x/3.20.2/docker-compose.yml b/apps/xunlei-cnk3x/3.20.2/docker-compose.yml index 2dc624cc9..b13a2aa41 100644 --- a/apps/xunlei-cnk3x/3.20.2/docker-compose.yml +++ b/apps/xunlei-cnk3x/3.20.2/docker-compose.yml @@ -14,7 +14,7 @@ services: - ${PANEL_APP_PORT_HTTP}:2345 privileged: true env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${XUNLEI_ROOT_PATH}/data:/xunlei/data diff --git a/apps/xunlei-cnk3x/3.20.2/envs/default.env b/apps/xunlei-cnk3x/3.20.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/xunlei-cnk3x/3.20.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/xunlei-cnk3x/3.20.2/envs/global.env b/apps/xunlei-cnk3x/3.20.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/xunlei-cnk3x/3.20.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/xunlei-cnk3x/3.20.2/scripts/init.sh b/apps/xunlei-cnk3x/3.20.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/xunlei-cnk3x/3.20.2/scripts/init.sh +++ b/apps/xunlei-cnk3x/3.20.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh b/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh +++ b/apps/xunlei-cnk3x/3.20.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/yarr/2.4.0/envs/default.env b/apps/yarr/2.4.0/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/yarr/2.4.0/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/yarr/2.4.0/envs/global.env b/apps/yarr/2.4.0/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/yarr/2.4.0/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/zerotier-planet/1.14.2/docker-compose.yml b/apps/zerotier-planet/1.14.2/docker-compose.yml index 993bc2347..3e851d6cb 100644 --- a/apps/zerotier-planet/1.14.2/docker-compose.yml +++ b/apps/zerotier-planet/1.14.2/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP} - ${PANEL_APP_PORT_FILE}:${PANEL_APP_PORT_FILE} env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ZEROTIER_PLANET_ROOT_PATH}/file:/app/dist diff --git a/apps/zerotier-planet/1.14.2/envs/default.env b/apps/zerotier-planet/1.14.2/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/zerotier-planet/1.14.2/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/zerotier-planet/1.14.2/envs/global.env b/apps/zerotier-planet/1.14.2/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/zerotier-planet/1.14.2/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/zerotier-planet/1.14.2/scripts/init.sh b/apps/zerotier-planet/1.14.2/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/zerotier-planet/1.14.2/scripts/init.sh +++ b/apps/zerotier-planet/1.14.2/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/zerotier-planet/1.14.2/scripts/upgrade.sh b/apps/zerotier-planet/1.14.2/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/zerotier-planet/1.14.2/scripts/upgrade.sh +++ b/apps/zerotier-planet/1.14.2/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ztncui/1.2.17/docker-compose.yml b/apps/ztncui/1.2.17/docker-compose.yml index f4e30b051..e0772d4eb 100644 --- a/apps/ztncui/1.2.17/docker-compose.yml +++ b/apps/ztncui/1.2.17/docker-compose.yml @@ -16,7 +16,7 @@ services: - ${PANEL_APP_PORT_API}:${PANEL_APP_PORT_API}/udp - ${PANEL_APP_PORT_FILE}:3180 env_file: - - /etc/1panel/envs/global.env + - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - ${ZTNCUI_ROOT_PATH}/ztncui:/opt/key-networks/ztncui/etc diff --git a/apps/ztncui/1.2.17/envs/default.env b/apps/ztncui/1.2.17/envs/default.env new file mode 100644 index 000000000..cd05f46e6 --- /dev/null +++ b/apps/ztncui/1.2.17/envs/default.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +ENV_FILE=.env diff --git a/apps/ztncui/1.2.17/envs/global.env b/apps/ztncui/1.2.17/envs/global.env new file mode 100644 index 000000000..e10989fe4 --- /dev/null +++ b/apps/ztncui/1.2.17/envs/global.env @@ -0,0 +1,2 @@ +# copyright© 2024 XinJiang Ms Studio +TZ=Asia/Shanghai diff --git a/apps/ztncui/1.2.17/scripts/init.sh b/apps/ztncui/1.2.17/scripts/init.sh index 77b849120..07fb8c3fe 100644 --- a/apps/ztncui/1.2.17/scripts/init.sh +++ b/apps/ztncui/1.2.17/scripts/init.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish." diff --git a/apps/ztncui/1.2.17/scripts/upgrade.sh b/apps/ztncui/1.2.17/scripts/upgrade.sh index 77b849120..07fb8c3fe 100644 --- a/apps/ztncui/1.2.17/scripts/upgrade.sh +++ b/apps/ztncui/1.2.17/scripts/upgrade.sh @@ -6,7 +6,9 @@ if [ -f .env ]; then # setup-1 add default values CURRENT_DIR=$(pwd) sed -i '/^ENV_FILE=/d' .env + sed -i '/^GLOBAL_ENV_FILE=/d' .env echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env + echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env echo "Check Finish."