From 57d43f1a94b7ab20e7c45ac23c147574cd638605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Slavi=C5=A1a=20Are=C5=BEina?= <58952836+tremor021@users.noreply.github.com> Date: Sun, 4 Jan 2026 20:50:07 +0100 Subject: [PATCH] Refactor (#10516) --- ct/pelican-panel.sh | 26 +++++---------- install/pelican-panel-install.sh | 55 +++----------------------------- 2 files changed, 13 insertions(+), 68 deletions(-) diff --git a/ct/pelican-panel.sh b/ct/pelican-panel.sh index efa69f34b..a45867726 100644 --- a/ct/pelican-panel.sh +++ b/ct/pelican-panel.sh @@ -27,37 +27,31 @@ function update_script() { msg_error "No ${APP} Installation Found!" exit fi + setup_mariadb CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2) + setup_composer if [[ "$CURRENT_PHP" != "8.4" ]]; then msg_info "Migrating PHP $CURRENT_PHP to 8.4" - $STD curl -fsSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb - $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb - $STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' - $STD apt update $STD apt remove -y php"${CURRENT_PHP//./}"* - $STD apt install -y \ - php8.4 \ - php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,fpm} \ - libapache2-mod-php8.4 + PHP_VERSION="8.4" PHP_MODULE="mysql,sqlite3" PHP_APACHE="YES" PHP_FPM="YES" setup_php msg_ok "Migrated PHP $CURRENT_PHP to 8.4" fi - RELEASE=$(curl -fsSL https://api.github.com/repos/pelican-dev/panel/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') - if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then + if check_for_gh_release "pelican-panel" "pelican-dev/panel"; then msg_info "Stopping Service" cd /opt/pelican-panel $STD php artisan down msg_ok "Stopped Service" - msg_info "Updating ${APP} to v${RELEASE}" cp -r /opt/pelican-panel/.env /opt/ SQLITE_INSTALL=$(ls /opt/pelican-panel/database/*.sqlite 1>/dev/null 2>&1 && echo "true" || echo "false") $SQLITE_INSTALL && cp -r /opt/pelican-panel/database/*.sqlite /opt/ rm -rf * .* - curl -fsSL "https://github.com/pelican-dev/panel/releases/download/v${RELEASE}/panel.tar.gz" -o $(basename "https://github.com/pelican-dev/panel/releases/download/v${RELEASE}/panel.tar.gz") - tar -xzf "panel.tar.gz" + fetch_and_deploy_gh_release "pelican-panel" "pelican-dev/panel" "prebuild" "latest" "/opt/pelican-panel" "panel.tar.gz" + + msg_info "Updating Pelican Panel" mv /opt/.env /opt/pelican-panel/ $SQLITE_INSTALL && mv /opt/*.sqlite /opt/pelican-panel/database/ $STD composer install --no-dev --optimize-autoloader --no-interaction @@ -68,17 +62,13 @@ function update_script() { $STD php artisan migrate --seed --force chown -R www-data:www-data /opt/pelican-panel chmod -R 755 /opt/pelican-panel/storage /opt/pelican-panel/bootstrap/cache/ - rm -rf "/opt/pelican-panel/panel.tar.gz" - echo "${RELEASE}" >/opt/${APP}_version.txt - msg_ok "Updated $APP to v${RELEASE}" + msg_ok "Updated Pelican Panel" msg_info "Starting Service" $STD php artisan queue:restart $STD php artisan up msg_ok "Started Service" msg_ok "Updated successfully!" - else - msg_ok "No update required. ${APP} is already at v${RELEASE}" fi exit } diff --git a/install/pelican-panel-install.sh b/install/pelican-panel-install.sh index d9e058452..20515a804 100644 --- a/install/pelican-panel-install.sh +++ b/install/pelican-panel-install.sh @@ -13,65 +13,20 @@ setting_up_container network_check update_os -msg_info "Installing Dependencies" -$STD apt install -y \ - lsb-release \ - apache2 \ - composer -msg_ok "Installed Dependencies" - +PHP_VERSION="8.4" PHP_MODULE="mysql,sqlite3" PHP_APACHE="YES" PHP_FPM="YES" setup_php +setup_composer setup_mariadb - -msg_info "Adding PHP8.4 Repository" -$STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb -$STD dpkg -i /tmp/debsuryorg-archive-keyring.deb -cat </etc/apt/sources.list.d/php.sources -Types: deb -URIs: https://packages.sury.org/php/ -Suites: $(lsb_release -sc) -Components: main -Signed-By: /usr/share/keyrings/deb.sury.org-php.gpg -EOF -$STD apt update -msg_ok "Added PHP8.4 Repository" - -msg_info "Installing PHP" -$STD apt remove -y php8.2* -$STD apt install -y \ - php8.4 \ - php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,sqlite3,fpm} \ - libapache2-mod-php8.4 -msg_info "Installed PHP" - -msg_info "Setting up MariaDB" -DB_NAME=panel -DB_USER=pelican -DB_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13) -$STD mariadb -u root -e "CREATE DATABASE $DB_NAME;" -$STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';" -$STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;" -{ - echo "Pelican Panel-Credentials" - echo "Pelican Panel Database User: $DB_USER" - echo "Pelican Panel Database Password: $DB_PASS" - echo "Pelican Panel Database Name: $DB_NAME" -} >>~/pelican-panel.creds -msg_ok "Set up MariaDB" +MARIADB_DB_NAME="panel" MARIADB_DB_USER="pelican" setup_mariadb_db +fetch_and_deploy_gh_release "pelican-panel" "pelican-dev/panel" "prebuild" "latest" "/opt/pelican-panel" "panel.tar.gz" msg_info "Installing Pelican Panel" -RELEASE=$(curl -fsSL https://api.github.com/repos/pelican-dev/panel/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') -mkdir /opt/pelican-panel cd /opt/pelican-panel -curl -fsSL "https://github.com/pelican-dev/panel/releases/download/v${RELEASE}/panel.tar.gz" -o "panel.tar.gz" -tar -xzf "panel.tar.gz" -COMPOSER_ALLOW_SUPERUSER=1 $STD composer install --no-dev --optimize-autoloader --no-interaction +$STD composer install --no-dev --optimize-autoloader --no-interaction $STD php artisan p:environment:setup $STD php artisan p:environment:queue-service --no-interaction echo "* * * * * php /opt/pelican-panel/artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data - chown -R www-data:www-data /opt/pelican-panel chmod -R 755 /opt/pelican-panel/storage /opt/pelican-panel/bootstrap/cache/ -rm -rf "/opt/pelican-panel/panel.tar.gz" -echo "${RELEASE}" >/opt/"${APPLICATION}"_version.txt msg_ok "Installed Pelican Panel" msg_info "Creating Service"