allow override of admin password wit ocis init

Signed-off-by: Christian Richter <crichter@owncloud.com>
This commit is contained in:
Christian Richter
2022-04-29 14:15:48 +02:00
parent 59c96413d9
commit c47e43318a
2 changed files with 18 additions and 6 deletions
+8 -4
View File
@@ -142,7 +142,7 @@ func backupOcisConfigFile(configPath string) (string, error) {
return targetBackupConfig, nil
}
func CreateConfig(insecure, forceOverwrite bool, configPath string) error {
func CreateConfig(insecure, forceOverwrite bool, configPath, adminPassword string) error {
targetBackupConfig := ""
err := checkConfigPath(configPath)
@@ -167,10 +167,14 @@ func CreateConfig(insecure, forceOverwrite bool, configPath string) error {
if err != nil {
return fmt.Errorf("could not generate random password for idp: %s", err)
}
ocisAdminServicePassword, err := generators.GenerateRandomPassword(passwordLength)
if err != nil {
return fmt.Errorf("could not generate random password for ocis admin: %s", err)
ocisAdminServicePassword := adminPassword
if ocisAdminServicePassword == "" {
ocisAdminServicePassword, err = generators.GenerateRandomPassword(passwordLength)
if err != nil {
return fmt.Errorf("could not generate random password for ocis admin: %s", err)
}
}
revaServicePassword, err := generators.GenerateRandomPassword(passwordLength)
if err != nil {
return fmt.Errorf("could not generate random password for reva: %s", err)