beenull/PhyrePanel-mirror
1
0
Fork 0
mirror of https://github.com/PhyreApps/PhyrePanel.git synced 2024-11-24 16:40:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Bozhidar 2024-10-31 15:23:53 +02:00
commit e8dc629c9c
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
web/app/Models/HostingSubscription.php
View file

@ -53,7 +53,7 @@ class HostingSubscription extends Model
$model->system_username = $create['system_username']; $model->system_username = $create['system_username'];
$model->system_password = $create['system_password']; $model->system_password = $create['system_password'];
} else { } 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 @@ class HostingSubscription extends Model
} }
return []; return [
'error'=>true,
'message'=>$createLinuxWebUserOutput
];
} }
private static function _generateUsername($string) private static function _generateUsername($string)

2
web/update.sh
View file

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