From b265c154b619e7f9350a958ff25cc9137e7eec5a Mon Sep 17 00:00:00 2001
From: Bozhidar <bobi@microweber.com>
Date: Wed, 24 Apr 2024 16:57:03 +0300
Subject: [PATCH] update

---
 README.md                                     |  7 ++++
 installers/compile-installers.sh              |  2 ++
 .../install-partial/install_base.sh           |  1 -
 installers/ubuntu-20.04/install.sh            |  1 -
 .../install-partial/install_base.sh           |  1 -
 installers/ubuntu-22.04/install.sh            |  1 -
 web/app/Livewire/Installer.php                | 36 +++++++++----------
 7 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 2dfda29e..9cda7eaf 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,13 @@
 
 PHYRE PANEL is a powerful Linux multi-platform hosting control panel designed to simplify the process of managing web hosting servers. Whether you're a seasoned sysadmin or just starting out, PHYRE PANEL provides an intuitive interface and robust features to streamline your hosting management tasks.
 
+## Installation
+To install PhyrePanel, you need to run this commands:
+```
+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
+
 ## Server Application Types Supported
 
 PHYRE PANEL supports a variety of server application types, including:
diff --git a/installers/compile-installers.sh b/installers/compile-installers.sh
index 65af666c..13d917e8 100755
--- a/installers/compile-installers.sh
+++ b/installers/compile-installers.sh
@@ -6,6 +6,7 @@ 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-20.04/install.sh
 echo "$INSTALL_BASE" >> ubuntu-20.04/install.sh
 echo "$DOWNLOAD_WEB" >> ubuntu-20.04/install.sh
 echo "$INSTALL_WEB" >> ubuntu-20.04/install.sh
@@ -19,6 +20,7 @@ DOWNLOAD_WEB=$(cat ubuntu-22.04/install-partial/download_web.sh)
 INSTALL_WEB=$(cat ubuntu-22.04/install-partial/install_web.sh)
 
 # create installer
+rm -rf ubuntu-22.04/install.sh
 echo "$INSTALL_BASE" >> ubuntu-22.04/install.sh
 echo "$DOWNLOAD_WEB" >> ubuntu-22.04/install.sh
 echo "$INSTALL_WEB" >> ubuntu-22.04/install.sh
diff --git a/installers/ubuntu-20.04/install-partial/install_base.sh b/installers/ubuntu-20.04/install-partial/install_base.sh
index bfff9d56..5161520a 100644
--- a/installers/ubuntu-20.04/install-partial/install_base.sh
+++ b/installers/ubuntu-20.04/install-partial/install_base.sh
@@ -2,7 +2,6 @@
 INSTALL_DIR="/phyre/install"
 
 apt-get update && apt-get install ca-certificates
-apt-get upgrade -y
 
 mkdir -p $INSTALL_DIR
 
diff --git a/installers/ubuntu-20.04/install.sh b/installers/ubuntu-20.04/install.sh
index d4abb801..e3723b25 100644
--- a/installers/ubuntu-20.04/install.sh
+++ b/installers/ubuntu-20.04/install.sh
@@ -2,7 +2,6 @@
 INSTALL_DIR="/phyre/install"
 
 apt-get update && apt-get install ca-certificates
-apt-get upgrade -y
 
 mkdir -p $INSTALL_DIR
 
diff --git a/installers/ubuntu-22.04/install-partial/install_base.sh b/installers/ubuntu-22.04/install-partial/install_base.sh
index 9a392c72..c6783057 100644
--- a/installers/ubuntu-22.04/install-partial/install_base.sh
+++ b/installers/ubuntu-22.04/install-partial/install_base.sh
@@ -2,7 +2,6 @@
 INSTALL_DIR="/phyre/install"
 
 apt-get update && apt-get install ca-certificates
-apt-get upgrade -y
 
 mkdir -p $INSTALL_DIR
 
diff --git a/installers/ubuntu-22.04/install.sh b/installers/ubuntu-22.04/install.sh
index 972c2764..a93f6e52 100644
--- a/installers/ubuntu-22.04/install.sh
+++ b/installers/ubuntu-22.04/install.sh
@@ -2,7 +2,6 @@
 INSTALL_DIR="/phyre/install"
 
 apt-get update && apt-get install ca-certificates
-apt-get upgrade -y
 
 mkdir -p $INSTALL_DIR
 
diff --git a/web/app/Livewire/Installer.php b/web/app/Livewire/Installer.php
index 44df5154..a7d3d6db 100644
--- a/web/app/Livewire/Installer.php
+++ b/web/app/Livewire/Installer.php
@@ -248,25 +248,25 @@ public function form(Form $form): Form
 
                         }),
 
-                    Wizard\Step::make('Step 3')
-                        ->description('Configure your email server')
-                        ->schema([
-
-                            Toggle::make('enable_email_server')
-                                ->label('Enable Email Server')
-                                ->default(true),
-
-
-                        ])->afterValidation(function () {
-
-                            $dovecotInstaller = new DovecotInstaller();
-                            $dovecotInstaller->setLogFilePath(storage_path($this->install_log_file_path));
-                            $dovecotInstaller->install();
+//                    Wizard\Step::make('Step 3')
+//                        ->description('Configure your email server')
+//                        ->schema([
+//
+//                            Toggle::make('enable_email_server')
+//                                ->label('Enable Email Server')
+//                                ->default(true),
+//
+//
+//                        ])->afterValidation(function () {
+//
+//                            $dovecotInstaller = new DovecotInstaller();
+//                            $dovecotInstaller->setLogFilePath(storage_path($this->install_log_file_path));
+//                            $dovecotInstaller->install();
+//
+//                        //    dd(storage_path($this->install_log_file_path));
+//                        }),
 
-                        //    dd(storage_path($this->install_log_file_path));
-                        }),
-
-                    Wizard\Step::make('Step 4')
+                    Wizard\Step::make('Step 3')
                         ->description('Finish installation')
                         ->schema([