Merge branch 'main' of https://github.com/PhyreApps/PhyrePanel

PhyreApps · Oct 31, 2024 · e8dc629 · e8dc629
2 parents adbbc04 + d37bef5
commit e8dc629
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/web/app/Models/HostingSubscription.php b/web/app/Models/HostingSubscription.php
@@ -53,7 +53,7 @@ public static function boot()
                 $model->system_username = $create['system_username'];
                 $model->system_password = $create['system_password'];
             } else {
-                throw new \Exception('System username or password not created');
+                throw new \Exception('System username or password not created: Error: ' .json_encode($create));
             }
         });
 
@@ -185,7 +185,10 @@ private function _createLinuxWebUser($model): array
 
         }
 
-        return [];
+        return [
+            'error'=>true,
+            'message'=>$createLinuxWebUserOutput
+        ];
 
     }
     private static function _generateUsername($string)

diff --git a/web/update.sh b/web/update.sh
@@ -39,7 +39,7 @@ cp /usr/local/phyre/update/web/package.json /usr/local/phyre/web/package.json
 
 
 systemctl stop phyre
-apt-remove phyre -y
+apt remove phyre-nginx -y
 
 OS=$(lsb_release -si)
 OS_LOWER=$(echo $OS | tr '[:upper:]' '[:lower:]')