From 7cd81d08aaa23d5e7ce871cac54dc3965e6d9571 Mon Sep 17 00:00:00 2001 From: Bozhidar Date: Mon, 22 Apr 2024 14:40:08 +0300 Subject: [PATCH] update --- .github/workflows/app-unit-test.yml | 6 +++--- ....yml => compile-web-terminal-package.yml.stop-for-now} | 0 README.md | 2 +- docker/Dockerfile | 4 ++-- docker/docker-entrypoint.sh | 8 ++++---- docker/docker-entrypoint.sh_old | 2 +- installers/Ubuntu/22.04/install.sh | 8 ++++---- installers/Ubuntu/22.04/slow_install.sh | 6 +++--- installers/install.sh | 2 +- installers/ubuntu-20.04/install-partial/download_web.sh | 2 +- installers/ubuntu-20.04/install-partial/install_base.sh | 6 +++--- installers/ubuntu-20.04/install.sh | 8 ++++---- installers/ubuntu-22.04/install-partial/download_web.sh | 2 +- installers/ubuntu-22.04/install-partial/install_base.sh | 6 +++--- installers/ubuntu-22.04/install.sh | 8 ++++---- update/update-web-panel.sh | 2 +- web/app/Console/Commands/UpdatePhyre.php | 2 +- web/app/Filament/Pages/Updates.php | 2 +- web/app/Listeners/ModelPhyreServerCreatedListener.php | 2 +- web/app/Models/PhyreServer.php | 2 +- 20 files changed, 40 insertions(+), 40 deletions(-) rename .github/workflows/{compile-web-terminal-package.yml => compile-web-terminal-package.yml.stop-for-now} (100%) diff --git a/.github/workflows/app-unit-test.yml b/.github/workflows/app-unit-test.yml index 5fe1c89..5a8ac43 100644 --- a/.github/workflows/app-unit-test.yml +++ b/.github/workflows/app-unit-test.yml @@ -90,14 +90,14 @@ jobs: mkdir -p ../dist mv ./phyre-web-panel-build.zip ../dist/phyre-web-panel.zip - - name: Pushes to Phyre Panel Dist Repo + - name: Pushes to PhyrePanelWebCompiledVersions uses: cpina/github-action-push-to-another-repository@main env: SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }} with: source-directory: './dist' - destination-github-username: 'CloudVisionApps' - destination-repository-name: 'PhyrePanelWebDist' + destination-github-username: 'PhyreApps' + destination-repository-name: 'PhyrePanelWebCompiledVersions' user-email: bobicloudvision@gmail.com target-branch: main diff --git a/.github/workflows/compile-web-terminal-package.yml b/.github/workflows/compile-web-terminal-package.yml.stop-for-now similarity index 100% rename from .github/workflows/compile-web-terminal-package.yml rename to .github/workflows/compile-web-terminal-package.yml.stop-for-now diff --git a/README.md b/README.md index e34adf4..203339c 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ PhyrePanel is a web-based panel for linux. It is written in PHP and uses the Lar ## Installation To install PhyrePanel, you need to run this commands: ``` -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/install.sh && chmod +x install.sh && ./install.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/install.sh && chmod +x install.sh && ./install.sh ``` The admin panel can be opened on port: yourserver.com:8443 diff --git a/docker/Dockerfile b/docker/Dockerfile index 0f1aa73..22c0157 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,11 +45,11 @@ RUN mkdir -p $INSTALL_DIR WORKDIR $INSTALL_DIR # Install PHYRE PHP -RUN wget https://github.com/CloudVisionApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb \ +RUN wget https://github.com/PhyreApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb \ && dpkg -i phyre-php-8.2.0.deb # Install PHYRE NGINX -RUN wget https://github.com/CloudVisionApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb \ +RUN wget https://github.com/PhyreApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb \ && dpkg -i phyre-nginx-1.24.0.deb # Start PHYRE service diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 6675ae5..5f6b842 100644 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -8,7 +8,7 @@ apt-get update && apt-get install -y wget dos2unix # #apt-get install libsodium-dev -y # -#wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/install.sh && chmod +x install.sh && ./install.sh +#wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/install.sh && chmod +x install.sh && ./install.sh # #ls -la @@ -61,15 +61,15 @@ done # Start MySQL service mysql start -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/Ubuntu/22.04/greeting.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/Ubuntu/22.04/greeting.sh mv greeting.sh /etc/profile.d/phyre-greeting.sh # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb +wget https://github.com/PhyreApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb dpkg -i phyre-php-8.2.0.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb +wget https://github.com/PhyreApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb dpkg -i phyre-nginx-1.24.0.deb service phyre start diff --git a/docker/docker-entrypoint.sh_old b/docker/docker-entrypoint.sh_old index 9efc1f8..70c7a10 100644 --- a/docker/docker-entrypoint.sh_old +++ b/docker/docker-entrypoint.sh_old @@ -5,7 +5,7 @@ apt-get update && apt-get install -y wget # #apt-get install libsodium-dev -y # -#wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/install.sh && chmod +x install.sh && ./install.sh +#wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/install.sh && chmod +x install.sh && ./install.sh # #ls -la diff --git a/installers/Ubuntu/22.04/install.sh b/installers/Ubuntu/22.04/install.sh index b20a11d..fef840f 100644 --- a/installers/Ubuntu/22.04/install.sh +++ b/installers/Ubuntu/22.04/install.sh @@ -39,15 +39,15 @@ done # Start MySQL service mysql start -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/Ubuntu/22.04/greeting.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/Ubuntu/22.04/greeting.sh mv greeting.sh /etc/profile.d/phyre-greeting.sh # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb +wget https://github.com/PhyreApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb dpkg -i phyre-php-8.2.0.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb +wget https://github.com/PhyreApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb dpkg -i phyre-nginx-1.24.0.deb service phyre start @@ -56,7 +56,7 @@ PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php -wget https://github.com/CloudVisionApps/PhyrePanelWebDist/raw/main/phyre-web-panel.zip +wget https://github.com/PhyreApps/PhyrePanelWebCompiledVersions/raw/main/phyre-web-panel.zip unzip -qq -o phyre-web-panel.zip -d /usr/local/phyre/web rm -rf phyre-web-panel.zip diff --git a/installers/Ubuntu/22.04/slow_install.sh b/installers/Ubuntu/22.04/slow_install.sh index ea5d5ac..2c371d4 100644 --- a/installers/Ubuntu/22.04/slow_install.sh +++ b/installers/Ubuntu/22.04/slow_install.sh @@ -6,7 +6,7 @@ apt-get update && apt-get install ca-certificates apt install -y git cd / mkdir -p $MAIN_DIR -git clone https://github.com/CloudVisionApps/PhyrePanel.git $MAIN_DIR +git clone https://github.com/PhyreApps/PhyrePanel.git $MAIN_DIR HELPERS_DIR=$MAIN_DIR"/shell/helpers/ubuntu" . $HELPERS_DIR"/common.sh" @@ -141,11 +141,11 @@ systemctl restart apache2 #done # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb +wget https://github.com/PhyreApps/PhyrePanelPHPDist/raw/main/debian/php/dist/phyre-php-8.2.0.deb sudo dpkg -i phyre-php-8.2.0.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb +wget https://github.com/PhyreApps/PhyrePanelNginxDist/raw/main/debian/nginx/dist/phyre-nginx-1.24.0.deb sudo dpkg -i phyre-nginx-1.24.0.deb # sudo ufw allow proto tcp from any to any port 80,443 diff --git a/installers/install.sh b/installers/install.sh index 7a4b938..1c68990 100644 --- a/installers/install.sh +++ b/installers/install.sh @@ -39,7 +39,7 @@ DISTRO_NAME=${DISTRO_NAME//\"/} # Remove quotes from name string # Lowercase the distro name DISTRO_NAME=$(echo $DISTRO_NAME | tr '[:upper:]' '[:lower:]') -INSTALLER_URL="https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/${DISTRO_NAME}-${DISTRO_VERSION}/install.sh" +INSTALLER_URL="https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/${DISTRO_NAME}-${DISTRO_VERSION}/install.sh" INSTALLER_CONTENT=$(wget ${INSTALLER_URL} 2>&1) if [[ "$INSTALLER_CONTENT" =~ 404\ Not\ Found ]]; then diff --git a/installers/ubuntu-20.04/install-partial/download_web.sh b/installers/ubuntu-20.04/install-partial/download_web.sh index 669b66a..cce3df4 100644 --- a/installers/ubuntu-20.04/install-partial/download_web.sh +++ b/installers/ubuntu-20.04/install-partial/download_web.sh @@ -1,6 +1,6 @@ #!/bin/bash -wget https://github.com/CloudVisionApps/PhyrePanelWebDist/raw/main/phyre-web-panel.zip +wget https://github.com/PhyreApps/PhyrePanelWebCompiledVersions/raw/main/phyre-web-panel.zip unzip -qq -o phyre-web-panel.zip -d /usr/local/phyre/web rm -rf phyre-web-panel.zip diff --git a/installers/ubuntu-20.04/install-partial/install_base.sh b/installers/ubuntu-20.04/install-partial/install_base.sh index c0935c6..bfff9d5 100644 --- a/installers/ubuntu-20.04/install-partial/install_base.sh +++ b/installers/ubuntu-20.04/install-partial/install_base.sh @@ -41,15 +41,15 @@ done # Start MySQL service mysql start -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/ubuntu-20.04/greeting.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/ubuntu-20.04/greeting.sh mv greeting.sh /etc/profile.d/phyre-greeting.sh # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-20.04.deb +wget https://github.com/PhyreApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-20.04.deb dpkg -i phyre-php-8.2.0-ubuntu-20.04.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-20.04.deb +wget https://github.com/PhyreApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-20.04.deb dpkg -i phyre-nginx-1.24.0-ubuntu-20.04.deb service phyre start diff --git a/installers/ubuntu-20.04/install.sh b/installers/ubuntu-20.04/install.sh index ba9c1a3..d4abb80 100644 --- a/installers/ubuntu-20.04/install.sh +++ b/installers/ubuntu-20.04/install.sh @@ -41,15 +41,15 @@ done # Start MySQL service mysql start -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/ubuntu-20.04/greeting.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/ubuntu-20.04/greeting.sh mv greeting.sh /etc/profile.d/phyre-greeting.sh # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-20.04.deb +wget https://github.com/PhyreApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-20.04.deb dpkg -i phyre-php-8.2.0-ubuntu-20.04.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-20.04.deb +wget https://github.com/PhyreApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-20.04.deb dpkg -i phyre-nginx-1.24.0-ubuntu-20.04.deb service phyre start @@ -59,7 +59,7 @@ PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php #!/bin/bash -wget https://github.com/CloudVisionApps/PhyrePanelWebDist/raw/main/phyre-web-panel.zip +wget https://github.com/PhyreApps/PhyrePanelWebCompiledVersions/raw/main/phyre-web-panel.zip unzip -qq -o phyre-web-panel.zip -d /usr/local/phyre/web rm -rf phyre-web-panel.zip diff --git a/installers/ubuntu-22.04/install-partial/download_web.sh b/installers/ubuntu-22.04/install-partial/download_web.sh index 669b66a..cce3df4 100644 --- a/installers/ubuntu-22.04/install-partial/download_web.sh +++ b/installers/ubuntu-22.04/install-partial/download_web.sh @@ -1,6 +1,6 @@ #!/bin/bash -wget https://github.com/CloudVisionApps/PhyrePanelWebDist/raw/main/phyre-web-panel.zip +wget https://github.com/PhyreApps/PhyrePanelWebCompiledVersions/raw/main/phyre-web-panel.zip unzip -qq -o phyre-web-panel.zip -d /usr/local/phyre/web rm -rf phyre-web-panel.zip diff --git a/installers/ubuntu-22.04/install-partial/install_base.sh b/installers/ubuntu-22.04/install-partial/install_base.sh index e899c15..9a392c7 100644 --- a/installers/ubuntu-22.04/install-partial/install_base.sh +++ b/installers/ubuntu-22.04/install-partial/install_base.sh @@ -41,15 +41,15 @@ done # Start MySQL service mysql start -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/ubuntu-22.04/greeting.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/ubuntu-22.04/greeting.sh mv greeting.sh /etc/profile.d/phyre-greeting.sh # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-22.04.deb +wget https://github.com/PhyreApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-22.04.deb dpkg -i phyre-php-8.2.0-ubuntu-22.04.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-22.04.deb +wget https://github.com/PhyreApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-22.04.deb dpkg -i phyre-nginx-1.24.0-ubuntu-22.04.deb service phyre start diff --git a/installers/ubuntu-22.04/install.sh b/installers/ubuntu-22.04/install.sh index 91b2aa4..972c276 100644 --- a/installers/ubuntu-22.04/install.sh +++ b/installers/ubuntu-22.04/install.sh @@ -41,15 +41,15 @@ done # Start MySQL service mysql start -wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/ubuntu-22.04/greeting.sh +wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/ubuntu-22.04/greeting.sh mv greeting.sh /etc/profile.d/phyre-greeting.sh # Install PHYRE PHP -wget https://github.com/CloudVisionApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-22.04.deb +wget https://github.com/PhyreApps/PhyrePanelPHP/raw/main/compilators/debian/php/dist/phyre-php-8.2.0-ubuntu-22.04.deb dpkg -i phyre-php-8.2.0-ubuntu-22.04.deb # Install PHYRE NGINX -wget https://github.com/CloudVisionApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-22.04.deb +wget https://github.com/PhyreApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-22.04.deb dpkg -i phyre-nginx-1.24.0-ubuntu-22.04.deb service phyre start @@ -59,7 +59,7 @@ PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php #!/bin/bash -wget https://github.com/CloudVisionApps/PhyrePanelWebDist/raw/main/phyre-web-panel.zip +wget https://github.com/PhyreApps/PhyrePanelWebCompiledVersions/raw/main/phyre-web-panel.zip unzip -qq -o phyre-web-panel.zip -d /usr/local/phyre/web rm -rf phyre-web-panel.zip diff --git a/update/update-web-panel.sh b/update/update-web-panel.sh index a892f12..7be2c0c 100644 --- a/update/update-web-panel.sh +++ b/update/update-web-panel.sh @@ -1,7 +1,7 @@ rm -rf /usr/local/phyre/update/web-panel-latest rm -rf /usr/local/phyre/update/phyre-web-panel.zip -wget https://github.com/CloudVisionApps/PhyrePanelWebDist/raw/main/phyre-web-panel.zip +wget https://github.com/PhyreApps/PhyrePanelWebCompiledVersions/raw/main/phyre-web-panel.zip ls -la unzip -o phyre-web-panel.zip -d /usr/local/phyre/update/web-panel-latest diff --git a/web/app/Console/Commands/UpdatePhyre.php b/web/app/Console/Commands/UpdatePhyre.php index 57eb252..6452e8c 100644 --- a/web/app/Console/Commands/UpdatePhyre.php +++ b/web/app/Console/Commands/UpdatePhyre.php @@ -29,7 +29,7 @@ class UpdatePhyre extends Command $output = ''; $output .= exec('mkdir -p /usr/local/phyre/update'); - $output .= exec('wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/update/update-web-panel.sh -O /usr/local/phyre/update/update-web-panel.sh'); + $output .= exec('wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/update/update-web-panel.sh -O /usr/local/phyre/update/update-web-panel.sh'); $output .= exec('chmod +x /usr/local/phyre/update/update-web-panel.sh'); $this->info($output); diff --git a/web/app/Filament/Pages/Updates.php b/web/app/Filament/Pages/Updates.php index f3496b9..58f6a91 100644 --- a/web/app/Filament/Pages/Updates.php +++ b/web/app/Filament/Pages/Updates.php @@ -24,7 +24,7 @@ class Updates extends Page $output = ''; $output .= exec('mkdir -p /usr/local/phyre/update'); - $output .= exec('wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/update/update-web-panel.sh -O /usr/local/phyre/update/update-web-panel.sh'); + $output .= exec('wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/update/update-web-panel.sh -O /usr/local/phyre/update/update-web-panel.sh'); $output .= exec('chmod +x /usr/local/phyre/update/update-web-panel.sh'); $output .= shell_exec('bash /usr/local/phyre/update/update-web-panel.sh >> ' . $this->logFilePath . ' &'); diff --git a/web/app/Listeners/ModelPhyreServerCreatedListener.php b/web/app/Listeners/ModelPhyreServerCreatedListener.php index edafcb3..043f2c5 100644 --- a/web/app/Listeners/ModelPhyreServerCreatedListener.php +++ b/web/app/Listeners/ModelPhyreServerCreatedListener.php @@ -38,7 +38,7 @@ class ModelPhyreServerCreatedListener $ssh = new SSH2($ip); if ($ssh->login($username, $password)) { - $ssh->exec('wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/installers/install.sh'); + $ssh->exec('wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/install.sh'); $ssh->exec('chmod +x install.sh'); $ssh->exec('./install.sh >phyre-install.log 2>&1 exec('wget https://raw.githubusercontent.com/CloudVisionApps/PhyrePanel/main/update/update-web-panel.sh -O /usr/local/phyre/update/update-web-panel.sh'); + $output .= $ssh->exec('wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/update/update-web-panel.sh -O /usr/local/phyre/update/update-web-panel.sh'); $output .= $ssh->exec('chmod +x /usr/local/phyre/update/update-web-panel.sh'); $output .= $ssh->exec('/usr/local/phyre/update/update-web-panel.sh');