upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge pull request #53617 from nextcloud/backport/53616/stable30

Browse source
This commit is contained in:
Kate 2025-06-20 13:01:15 +02:00 committed by GitHub
commit c5c6dcb027
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/Command/User/Add.php
View file

@ -52,7 +52,7 @@ class Add extends Command {
'password-from-env',
null,
InputOption::VALUE_NONE,
'read password from environment variable OC_PASS'
'read password from environment variable NC_PASS/OC_PASS'
)
->addOption(
'generate-password',
@ -91,10 +91,10 @@ class Add extends Command {
// Setup password.
if ($input->getOption('password-from-env')) {
$password = getenv('OC_PASS');
$password = getenv('NC_PASS') ?: getenv('OC_PASS');
if (!$password) {
$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
return 1;
}
} elseif ($input->getOption('generate-password')) {

4
core/Command/User/AuthTokens/Add.php
View file

@ -62,9 +62,9 @@ class Add extends Command {
}
if ($input->getOption('password-from-env')) {
$password = getenv('NC_PASS') ?? getenv('OC_PASS');
$password = getenv('NC_PASS') ?: getenv('OC_PASS');
if (!$password) {
$output->writeln('<error>--password-from-env given, but NC_PASS is empty!</error>');
$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
return 1;
}
} elseif ($input->isInteractive()) {

6
core/Command/User/ResetPassword.php
View file

@ -41,7 +41,7 @@ class ResetPassword extends Base {
'password-from-env',
null,
InputOption::VALUE_NONE,
'read password from environment variable OC_PASS'
'read password from environment variable NC_PASS/OC_PASS'
)
;
}
@ -56,9 +56,9 @@ class ResetPassword extends Base {
}
if ($input->getOption('password-from-env')) {
$password = getenv('OC_PASS');
$password = getenv('NC_PASS') ?: getenv('OC_PASS');
if (!$password) {
$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
$output->writeln('<error>--password-from-env given, but NC_PASS/OC_PASS is empty!</error>');
return 1;
}
} elseif ($input->isInteractive()) {