From 1c7796b9e97c62189c31da6be8915ad8c14ccdba Mon Sep 17 00:00:00 2001 From: Bozhidar Date: Tue, 1 Oct 2024 11:49:13 +0300 Subject: [PATCH] fix installators --- installers/ubuntu-20.04/install-partial/install_base.sh | 2 -- installers/ubuntu-20.04/install-partial/install_web.sh | 6 ++++++ installers/ubuntu-20.04/install.sh | 8 ++++++-- installers/ubuntu-22.04/install-partial/install_base.sh | 2 -- installers/ubuntu-22.04/install.sh | 8 ++++++-- installers/ubuntu-24.04/install-partial/install_base.sh | 2 -- installers/ubuntu-24.04/install.sh | 8 ++++++-- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/installers/ubuntu-20.04/install-partial/install_base.sh b/installers/ubuntu-20.04/install-partial/install_base.sh index 65037b4..ecd65dc 100644 --- a/installers/ubuntu-20.04/install-partial/install_base.sh +++ b/installers/ubuntu-20.04/install-partial/install_base.sh @@ -55,8 +55,6 @@ dpkg -i phyre-php-8.2.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 - PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php diff --git a/installers/ubuntu-20.04/install-partial/install_web.sh b/installers/ubuntu-20.04/install-partial/install_web.sh index 590ed29..40a6f2f 100644 --- a/installers/ubuntu-20.04/install-partial/install_web.sh +++ b/installers/ubuntu-20.04/install-partial/install_web.sh @@ -64,6 +64,12 @@ 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/ +mkdir -p /usr/local/phyre/ssl +cp /usr/local/phyre/web/server/ssl/phyre.crt /usr/local/phyre/ssl/phyre.crt +cp /usr/local/phyre/web/server/ssl/phyre.key /usr/local/phyre/ssl/phyre.key + +service phyre start + CURRENT_IP=$(hostname -I | awk '{print $1}') echo "PhyrePanel downloaded successfully." diff --git a/installers/ubuntu-20.04/install.sh b/installers/ubuntu-20.04/install.sh index 14ae71e..546d1b0 100644 --- a/installers/ubuntu-20.04/install.sh +++ b/installers/ubuntu-20.04/install.sh @@ -55,8 +55,6 @@ dpkg -i phyre-php-8.2.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 - PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php @@ -148,6 +146,12 @@ 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/ +mkdir -p /usr/local/phyre/ssl +cp /usr/local/phyre/web/server/ssl/phyre.crt /usr/local/phyre/ssl/phyre.crt +cp /usr/local/phyre/web/server/ssl/phyre.key /usr/local/phyre/ssl/phyre.key + +service phyre start + CURRENT_IP=$(hostname -I | awk '{print $1}') echo "PhyrePanel downloaded successfully." diff --git a/installers/ubuntu-22.04/install-partial/install_base.sh b/installers/ubuntu-22.04/install-partial/install_base.sh index 7419c71..9d405b0 100644 --- a/installers/ubuntu-22.04/install-partial/install_base.sh +++ b/installers/ubuntu-22.04/install-partial/install_base.sh @@ -55,8 +55,6 @@ dpkg -i phyre-php-8.2.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 - PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php diff --git a/installers/ubuntu-22.04/install.sh b/installers/ubuntu-22.04/install.sh index 50c0690..366302e 100644 --- a/installers/ubuntu-22.04/install.sh +++ b/installers/ubuntu-22.04/install.sh @@ -55,8 +55,6 @@ dpkg -i phyre-php-8.2.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 - PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php @@ -150,6 +148,12 @@ 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/ +mkdir -p /usr/local/phyre/ssl +cp /usr/local/phyre/web/server/ssl/phyre.crt /usr/local/phyre/ssl/phyre.crt +cp /usr/local/phyre/web/server/ssl/phyre.key /usr/local/phyre/ssl/phyre.key + +service phyre start + CURRENT_IP=$(hostname -I | awk '{print $1}') echo "PhyrePanel downloaded successfully." diff --git a/installers/ubuntu-24.04/install-partial/install_base.sh b/installers/ubuntu-24.04/install-partial/install_base.sh index 9f508cc..4204383 100644 --- a/installers/ubuntu-24.04/install-partial/install_base.sh +++ b/installers/ubuntu-24.04/install-partial/install_base.sh @@ -55,8 +55,6 @@ dpkg -i phyre-php-8.2.0-ubuntu-24.04.deb wget https://github.com/PhyreApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-24.04.deb dpkg -i phyre-nginx-1.24.0-ubuntu-24.04.deb -service phyre start - PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php diff --git a/installers/ubuntu-24.04/install.sh b/installers/ubuntu-24.04/install.sh index ffcbc5c..f619c6b 100644 --- a/installers/ubuntu-24.04/install.sh +++ b/installers/ubuntu-24.04/install.sh @@ -55,8 +55,6 @@ dpkg -i phyre-php-8.2.0-ubuntu-24.04.deb wget https://github.com/PhyreApps/PhyrePanelNGINX/raw/main/compilators/debian/nginx/dist/phyre-nginx-1.24.0-ubuntu-24.04.deb dpkg -i phyre-nginx-1.24.0-ubuntu-24.04.deb -service phyre start - PHYRE_PHP=/usr/local/phyre/php/bin/php ln -s $PHYRE_PHP /usr/bin/phyre-php @@ -150,6 +148,12 @@ 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/ +mkdir -p /usr/local/phyre/ssl +cp /usr/local/phyre/web/server/ssl/phyre.crt /usr/local/phyre/ssl/phyre.crt +cp /usr/local/phyre/web/server/ssl/phyre.key /usr/local/phyre/ssl/phyre.key + +service phyre start + CURRENT_IP=$(hostname -I | awk '{print $1}') echo "PhyrePanel downloaded successfully."