diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index e29a5f03..b341eb47 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,4 +1,4 @@ # These are supported funding model platforms open_collective: haozi-panel -custom: ['https://afdian.net/a/haozi-team'] +custom: ['https://afdian.net/a/TheTNB'] diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 7f9aa38f..4ad074a3 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -20,7 +20,7 @@ jobs: - name: Fetch Frontend run: | sudo apt-get install -y curl jq unzip zip - curl -sSL https://api.github.com/repos/haozi-team/panel-frontend/releases/latest | jq -r ".assets[] | select(.name | contains(\"dist\")) | .browser_download_url" | xargs curl -L -o frontend.zip + curl -sSL https://api.github.com/repos/TheTNB/panel-frontend/releases/latest | jq -r ".assets[] | select(.name | contains(\"dist\")) | .browser_download_url" | xargs curl -L -o frontend.zip rm -rf public unzip frontend.zip mv dist public diff --git a/.github/workflows/issue-auto-reply.yml b/.github/workflows/issue-auto-reply.yml index d82f4a98..0ef9c37a 100644 --- a/.github/workflows/issue-auto-reply.yml +++ b/.github/workflows/issue-auto-reply.yml @@ -27,7 +27,7 @@ jobs: 我们认为您的建议非常有价值!欢迎提交 PR,请包含相应的测试用例、文档等,并确保 CI 通过,感谢和期待您的贡献! We think your suggestion is very valuable! Welcome to submit a PR, please include test cases, documentation, etc., and ensure that the CI is passed, thank you and look forward to your contribution! - ![aoligei](https://github.com/haozi-team/panel/assets/115467771/fb04debf-3f4c-4fac-a0b8-c3455f8e57a0) + ![aoligei](https://github.com/TheTNB/panel/assets/115467771/fb04debf-3f4c-4fac-a0b8-c3455f8e57a0) - name: ☢️ Bug if: github.event.label.name == '☢️ Bug' uses: actions-cool/issues-helper@v3 @@ -41,4 +41,4 @@ jobs: 我们认为您的反馈非常有价值!欢迎提交 PR,请包含相应的测试用例、文档等,并确保 CI 通过,感谢和期待您的贡献! We think your feedback is very valuable! Welcome to submit a PR, please include test cases, documentation, etc., and ensure that the CI is passed, thank you and look forward to your contribution! - ![aoligei](https://github.com/haozi-team/panel/assets/115467771/fb04debf-3f4c-4fac-a0b8-c3455f8e57a0) + ![aoligei](https://github.com/TheTNB/panel/assets/115467771/fb04debf-3f4c-4fac-a0b8-c3455f8e57a0) diff --git a/README.md b/README.md index 483a7971..b783e6aa 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@

耗子 Linux 面板

- - - - - - FOSSA Status + + + + + + FOSSA Status

耗子 Linux 面板是使用 Golang + Vue 开发的轻量 Linux 服务器运维管理面板,以 GNU Affero General Public License v3.0 开源。 @@ -39,7 +39,7 @@ 不在下表中的其他 RHEL 9.x 系统,可自行尝试安装,但不保证能够正常运行,且不提供无偿技术支持(理论上不会有大问题)。 -CentOS Stream 可使用迁移脚本迁移至支持的系统: [CentOS 8/9 迁移脚本](https://github.com/haozi-team/byecentos) +CentOS Stream 可使用迁移脚本迁移至支持的系统: [CentOS 8/9 迁移脚本](https://github.com/TheTNB/byecentos) | 系统 | 版本 | |------------|----| @@ -81,7 +81,7 @@ HAOZI_DL_URL="https://git.haozi.net/opensource/download/-/raw/main/panel"; curl panel ``` -在 [Wiki](https://github.com/haozi-team/panel/wiki) 中查看更多使用方法和技巧。 +在 [Wiki](https://github.com/TheTNB/panel/wiki) 中查看更多使用方法和技巧。 ## 问题反馈 @@ -93,7 +93,7 @@ panel ### 寻找/创建 Issue -您可以在 [Issue 列表](https://github.com/haozi-team/panel/issues) 中寻找或创建一个 Issue,留言表达想要处理该 Issue 的意愿,得到维护者的确认后,即可开始处理。 +您可以在 [Issue 列表](https://github.com/TheTNB/panel/issues) 中寻找或创建一个 Issue,留言表达想要处理该 Issue 的意愿,得到维护者的确认后,即可开始处理。 ### 创建 PR @@ -124,11 +124,11 @@ panel ## Star 历史 - + - - - Star History Chart + + + Star History Chart diff --git a/README_EN.md b/README_EN.md index d3fc5ec7..a6331fa2 100644 --- a/README_EN.md +++ b/README_EN.md @@ -5,12 +5,12 @@

HaoZi Linux Panel

- - - - - - FOSSA Status + + + + + + FOSSA Status

The HaoZi Linux Panel is a lightweight Linux server operation and maintenance management panel developed using Golang and Vue. It is open source under the GNU Affero General Public License v3.0 protocol. @@ -39,7 +39,7 @@ Recommended to use `Debian` for low-configuration machines, as its resource usag For other RHEL 9.x systems not in the table, you can try to install it yourself, but normal operation is not guaranteed, and free technical support is not provided (theoretically there will be no major question). -CentOS Stream can be migrated to a supported system using the migration script: [CentOS 8/9 Migration Script](https://github.com/haozi-team/byecentos) +CentOS Stream can be migrated to a supported system using the migration script: [CentOS 8/9 Migration Script](https://github.com/TheTNB/byecentos) | OS | Version | |------------|---------| @@ -81,7 +81,7 @@ Use `panel` command for daily maintenance: panel ``` -See more usage methods and tips in [Wiki](https://github.com/haozi-team/panel/wiki). +See more usage methods and tips in [Wiki](https://github.com/TheTNB/panel/wiki). ## Feedback @@ -93,7 +93,7 @@ For issues with the panel itself, you can submit feedback on the `Issues` page o ### Find/Create Issue -You can find or create an Issue in [Issue List](https://github.com/haozi-team/panel/issues), leave a message to express your willingness to deal with the Issue, and get confirmation from the maintainer. Start processing. +You can find or create an Issue in [Issue List](https://github.com/TheTNB/panel/issues), leave a message to express your willingness to deal with the Issue, and get confirmation from the maintainer. Start processing. ### Create PR @@ -124,11 +124,11 @@ This project owes its existence to all those who have contributed. To contribute ## Star History - + - - - Star History Chart + + + Star History Chart diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index 2f0ed64f..d8cb5cad 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -173,7 +173,7 @@ func GetLatestPanelVersion() (PanelInfo, error) { if isChina { output, err = Exec(`curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest"`) } else { - output, err = Exec(`curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest"`) + output, err = Exec(`curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest"`) } if len(output) == 0 || err != nil { @@ -292,7 +292,7 @@ func GetPanelVersion(version string) (PanelInfo, error) { if isChina { output, err = Exec(`curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/` + version + `"`) } else { - output, err = Exec(`curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/tags/` + version + `"`) + output, err = Exec(`curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/tags/` + version + `"`) } if len(output) == 0 || err != nil { diff --git a/scripts/install_panel.sh b/scripts/install_panel.sh index 7007cf4f..5a6dbbfc 100644 --- a/scripts/install_panel.sh +++ b/scripts/install_panel.sh @@ -209,16 +209,16 @@ Init_Panel() { panelZip=$(curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest" | jq -r '.assets.links[] | select(.name | contains("amd64v2")) | .direct_asset_url') panelZipName=$(curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest" | jq -r '.assets.links[] | select(.name | contains("amd64v2")) | .name') else - panelZip=$(curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("amd64v2")) | .browser_download_url') - panelZipName=$(curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("amd64v2")) | .name') + panelZip=$(curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("amd64v2")) | .browser_download_url') + panelZipName=$(curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("amd64v2")) | .name') fi elif [ "${ARCH}" == "aarch64" ]; then if ${inChina}; then panelZip=$(curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest" | jq -r '.assets.links[] | select(.name | contains("arm64")) | .direct_asset_url') panelZipName=$(curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest" | jq -r '.assets.links[] | select(.name | contains("arm64")) | .name') else - panelZip=$(curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("arm64")) | .browser_download_url') - panelZipName=$(curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("arm64")) | .name') + panelZip=$(curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("arm64")) | .browser_download_url') + panelZipName=$(curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("arm64")) | .name') fi else echo -e $HR @@ -237,8 +237,8 @@ Init_Panel() { checksumsFile=$(curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest" | jq -r '.assets.links[] | select(.name | contains("checksums")) | .direct_asset_url') checksumsFileName=$(curl -sSL "https://git.haozi.net/api/v4/projects/opensource%2Fpanel/releases/permalink/latest" | jq -r '.assets.links[] | select(.name | contains("checksums")) | .name') else - checksumsFile=$(curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("checksums")) | .browser_download_url') - checksumsFileName=$(curl -sSL "https://api.github.com/repos/haozi-team/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("checksums")) | .name') + checksumsFile=$(curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("checksums")) | .browser_download_url') + checksumsFileName=$(curl -sSL "https://api.github.com/repos/TheTNB/panel/releases/latest" | jq -r '.assets[] | select(.name | contains("checksums")) | .name') fi wget -T 20 -t 3 -O ${setup_Path}/panel/${checksumsFileName} "${checksumsFile}" diff --git a/scripts/pureftpd/install.sh b/scripts/pureftpd/install.sh index 97c9038e..cbe0af00 100644 --- a/scripts/pureftpd/install.sh +++ b/scripts/pureftpd/install.sh @@ -89,15 +89,7 @@ touch ${pureftpdPath}/etc/pureftpd.passwd touch ${pureftpdPath}/etc/pureftpd.pdb openssl dhparam -out ${pureftpdPath}/etc/pure-ftpd-dhparams.pem 2048 -openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -sha256 -keyout ${pureftpdPath}/etc/pure-ftpd.pem -out ${pureftpdPath}/etc/pure-ftpd.pem << EOF -CN -Beijing -Beijing -HaoZi Technology Co., Ltd -HaoZi Panel -github.com/haozi-team/panel -panel@haozi.net -EOF +openssl req -x509 -nodes -days 36500 -newkey rsa:2048 -sha256 -keyout ${pureftpdPath}/etc/pure-ftpd.pem -out ${pureftpdPath}/etc/pure-ftpd.pem -subj "/C=CN/ST=Tianjin/L=Tianjin/O=HaoZi Technology Co., Ltd./OU=HaoZi Panel/CN=Panel" chmod 600 ${pureftpdPath}/etc/*.pem # 添加系统服务