Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separated user from group

Browse source
This commit is contained in:
Boy132 2021-04-20 17:39:34 +02:00 committed by GitHub
parent 2f6351ec00
commit c56e699985
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
app/Console/Commands/UpgradeCommand.php
View file

@ -14,7 +14,8 @@ class UpgradeCommand extends Command
/** @var string */ /** @var string */
protected $signature = 'p:upgrade protected $signature = 'p:upgrade
{--user= : The user (and group) that PHP runs under. All files will be owned by this user (and group).} {--user= : The user that PHP runs under. All files will be owned by this user.}
{--group= : The group that PHP runs under. All files will be owned by this group.}
{--url= : The specific archive to download.} {--url= : The specific archive to download.}
{--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.} {--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.}
{--skip-download : If set no archive will be downloaded.}'; {--skip-download : If set no archive will be downloaded.}';
@ -53,19 +54,32 @@ class UpgradeCommand extends Command
} }
if (is_null($this->option('user'))) { if (is_null($this->option('user'))) {
$user_details = posix_getpwuid(fileowner('public')); $userDetails = posix_getpwuid(fileowner('public'));
$user = $user_details['name'] ?? 'www-data'; $user = $userDetails['name'] ?? 'www-data';
$group_details = posix_getgrgid(filegroup('public')); if (!$this->confirm("Your webserver user has been detected as [{$user}]: is this correct?", true)) {
$group = $group_details['name'] ?? 'www-data';
if (!$this->confirm("Your webserver user (and group) has been detected as [{$user}:{$group}]: is this correct?", true)) {
$user = $this->anticipate( $user = $this->anticipate(
'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data:www-data", "nginx:nginx", or "apache:apache".', 'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
[ [
'www-data:www-data', 'www-data',
'nginx:nginx', 'nginx',
'apache:apache', 'apache',
]
);
}
}
if (is_null($this->option('group'))) {
$groupDetails = posix_getgrgid(filegroup('public'));
$group = $groupDetails['name'] ?? 'www-data';
if (!$this->confirm("Your webserver group has been detected as [{$group}]: is this correct?", true)) {
$group = $this->anticipate(
'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
[
'www-data',
'nginx',
'apache',
] ]
); );
} }