diff --git a/installers/compile-installers.sh b/installers/compile-installers.sh index 0d6c6de..64a6a5a 100755 --- a/installers/compile-installers.sh +++ b/installers/compile-installers.sh @@ -18,9 +18,9 @@ echo "$INSTALL_WEB" >> ubuntu-20.04/install.sh # get content from file INSTALL_BASE=$(cat ubuntu-22.04/install-partial/install_base.sh) -INSTALL_LOG=$(cat ubuntu-22.04/install-partial/install_log.sh) -DOWNLOAD_WEB=$(cat ubuntu-22.04/install-partial/download_web.sh) -INSTALL_WEB=$(cat ubuntu-22.04/install-partial/install_web.sh) +INSTALL_LOG=$(cat ubuntu-20.04/install-partial/install_log.sh) +DOWNLOAD_WEB=$(cat ubuntu-20.04/install-partial/download_web.sh) +INSTALL_WEB=$(cat ubuntu-20.04/install-partial/install_web.sh) # create installer rm -rf ubuntu-22.04/install.sh diff --git a/installers/ubuntu-22.04/install-partial/download_web.sh b/installers/ubuntu-22.04/install-partial/download_web.sh deleted file mode 100644 index cce3df4..0000000 --- a/installers/ubuntu-22.04/install-partial/download_web.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -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 - -chmod 711 /home -chmod -R 750 /usr/local/phyre diff --git a/installers/ubuntu-22.04/install-partial/install_log.sh b/installers/ubuntu-22.04/install-partial/install_log.sh deleted file mode 100755 index 78e2fe3..0000000 --- a/installers/ubuntu-22.04/install-partial/install_log.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -HOSTNAME=$(hostname) -IP_ADDRESS=$(hostname -I | cut -d " " -f 1) - -DISTRO_VERSION=$(cat /etc/os-release | grep -w "VERSION_ID" | cut -d "=" -f 2) -DISTRO_VERSION=${DISTRO_VERSION//\"/} # Remove quotes from version string - -DISTRO_NAME=$(cat /etc/os-release | grep -w "NAME" | cut -d "=" -f 2) -DISTRO_NAME=${DISTRO_NAME//\"/} # Remove quotes from name string - -LOG_JSON='{"os": "'$DISTRO_NAME-$DISTRO_VERSION'", "host_name": "'$HOSTNAME'", "ip": "'$IP_ADDRESS'"}' - -curl -s https://phyrepanel.com/api/phyre-installation-log -X POST -H "Content-Type: application/json" -d "$LOG_JSON" diff --git a/installers/ubuntu-22.04/install-partial/install_web.sh b/installers/ubuntu-22.04/install-partial/install_web.sh deleted file mode 100644 index 590ed29..0000000 --- a/installers/ubuntu-22.04/install-partial/install_web.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash - -# Check dir exists -if [ ! -d "/usr/local/phyre/web" ]; then - echo "PhyrePanel directory not found." - return 1 -fi - -# Go to web directory -cd /usr/local/phyre/web - -# Create MySQL user -MYSQL_PHYRE_ROOT_USERNAME="phyre" -MYSQL_PHYRE_ROOT_PASSWORD="$(tr -dc a-za-z0-9 /root/.mysql_root_password - -# Configure the application -phyre-php artisan phyre:set-ini-settings APP_ENV "local" -phyre-php artisan phyre:set-ini-settings APP_URL "127.0.0.1:8443" -phyre-php artisan phyre:set-ini-settings APP_NAME "PHYRE_PANEL" -phyre-php artisan phyre:set-ini-settings DB_DATABASE "$PHYRE_PANEL_DB_NAME" -phyre-php artisan phyre:set-ini-settings DB_USERNAME "$PHYRE_PANEL_DB_USER" -phyre-php artisan phyre:set-ini-settings DB_PASSWORD "$PHYRE_PANEL_DB_PASSWORD" -phyre-php artisan phyre:set-ini-settings DB_CONNECTION "mysql" -phyre-php artisan phyre:set-ini-settings MYSQL_ROOT_USERNAME "$MYSQL_PHYRE_ROOT_USERNAME" -phyre-php artisan phyre:set-ini-settings MYSQL_ROOT_PASSWORD "$MYSQL_PHYRE_ROOT_PASSWORD" -phyre-php artisan phyre:key-generate - -phyre-php artisan migrate -phyre-php artisan db:seed - -phyre-php artisan phyre:set-ini-settings APP_ENV "production" - -chmod -R o+w /usr/local/phyre/web/storage/ -chmod -R o+w /usr/local/phyre/web/bootstrap/cache/ - -CURRENT_IP=$(hostname -I | awk '{print $1}') - -echo "PhyrePanel downloaded successfully." -echo "Please visit http://$CURRENT_IP:8443 to continue installation of the panel."