diff options
| -rw-r--r-- | Docker/README.md | 6 | ||||
| -rwxr-xr-x | cli/create-user.php | 4 | ||||
| -rwxr-xr-x | cli/do-install.php | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Docker/README.md b/Docker/README.md index 5afb02a59..54f60a991 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -352,8 +352,8 @@ services: # So if changes are made (or in .env file), first delete the service and volumes. # ℹ️ All the --db-* parameters can be omitted if using built-in SQLite database. FRESHRSS_INSTALL: |- - --api_enabled - --base_url ${BASE_URL} + --api-enabled + --base-url ${BASE_URL} --db-base ${DB_BASE} --db-host ${DB_HOST} --db-password ${DB_PASSWORD} @@ -362,7 +362,7 @@ services: --default_user admin --language en FRESHRSS_USER: |- - --api_password ${ADMIN_API_PASSWORD} + --api-password ${ADMIN_API_PASSWORD} --email ${ADMIN_EMAIL} --language en --password ${ADMIN_PASSWORD} diff --git a/cli/create-user.php b/cli/create-user.php index 61bbc3563..1be604a42 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -58,6 +58,10 @@ if (!empty($cliOptions->errors)) { $username = $cliOptions->user; +if (preg_grep("/^$username$/i", listUsers())) { + fail('FreshRSS warning: username already exists “' . $username . '”', EXIT_CODE_ALREADY_EXISTS); +} + echo 'FreshRSS creating user “', $username, "”…\n"; $values = [ diff --git a/cli/do-install.php b/cli/do-install.php index 77acc58ed..483a443d9 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -132,7 +132,7 @@ if ((!empty($config['base_url'])) && is_string($config['base_url']) && Minz_Requ $config['pubsubhubbub_enabled'] = true; } -$config['db'] = array_merge($config['db'], array_filter($dbValues)); +$config['db'] = array_merge($config['db'], array_filter($dbValues, static fn($value) => $value !== null)); performRequirementCheck($config['db']['type']); |