fix: Use existing config instead of new one during install

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2022-06-19 23:29:57 +02:00
parent 3c0b3b726a
commit 433ff46d3b
2 changed files with 3 additions and 4 deletions

View File

@@ -102,7 +102,7 @@ class ConfigFileService implements ConfigInterface
$configData = new ConfigData();
// Generate a random salt that is used to add more seed to some passwords
$configData->setPasswordSalt(PasswordUtil::generateRandomBytes(30));
$configData->setPasswordSalt(PasswordUtil::generateRandomBytes());
$this->saveConfig($configData, false);

View File

@@ -36,7 +36,6 @@ use SP\DataModel\ProfileData;
use SP\DataModel\UserData;
use SP\DataModel\UserGroupData;
use SP\DataModel\UserProfileData;
use SP\Domain\Config\Adapters\ConfigData as ConfigSettings;
use SP\Domain\Config\ConfigInterface;
use SP\Domain\Config\ConfigServiceInterface;
use SP\Domain\Config\In\ConfigDataInterface;
@@ -263,8 +262,8 @@ final class InstallerService implements InstallerServiceInterface
*/
private function setupConfig(): ConfigDataInterface
{
$configData = new ConfigSettings();
$configData->setConfigVersion(VersionUtil::getVersionStringNormalized())
$configData = $this->config->getConfigData()
->setConfigVersion(VersionUtil::getVersionStringNormalized())
->setDatabaseVersion(VersionUtil::getVersionStringNormalized())
->setUpgradeKey(null)
->setDbHost($this->installData->getDbHost())