fix installators

PhyreApps · Oct 1, 2024 · 1c7796b · 1c7796b
1 parent c537046
commit 1c7796b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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."