viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug where alway overwrite...

Browse source
This commit is contained in:
viktorbarzin 2021-04-09 21:07:50 +01:00
parent e8cf7a99a6
commit 559c127876
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cli/email_alias.go
View file

@ -28,7 +28,6 @@ func addEmailAlias(gitFs *GitFS, to, fromDomain string) (string, error) {
} }
aliasEmail := generateRandomEmail(fromDomain) aliasEmail := generateRandomEmail(fromDomain)
glog.Infof("adding %s -> %s alias to %s", aliasEmail, to, emailAliasesConfigFileRelative) glog.Infof("adding %s -> %s alias to %s", aliasEmail, to, emailAliasesConfigFileRelative)
contents := fmt.Sprintf("%s %s", aliasEmail, to)
// Read existing contents // Read existing contents
fRead, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_RDONLY, 0644) fRead, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_RDONLY, 0644)
@ -40,20 +39,19 @@ func addEmailAlias(gitFs *GitFS, to, fromDomain string) (string, error) {
return "", errors.Wrapf(err, "failed to read existing aliases file") return "", errors.Wrapf(err, "failed to read existing aliases file")
} }
glog.Infof("current aliases file contents: \n%s", string(fileContentsBytes)) glog.Infof("current aliases file contents: \n%s", string(fileContentsBytes))
fRead.Close() defer fRead.Close()
newContents := getAddedAliasContents(string(fileContentsBytes), aliasEmail, to)
newContents := getAddedAliasContents(string(fileContentsBytes), aliasEmail, to)
// Write new contents // Write new contents
fWrite, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) fWrite, err := (*gitFs.fs).OpenFile(emailAliasesConfigFileRelative, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
if err != nil { if err != nil {
return "", errors.Wrapf(err, "failed to open file where new email alias will be added") return "", errors.Wrapf(err, "failed to open file where new email alias will be added")
} }
defer fWrite.Close()
glog.Infof("writing new contents to file: \n%s", newContents) glog.Infof("writing new contents to file: \n%s", newContents)
if _, err = fWrite.Write([]byte(contents)); err != nil { if _, err = fWrite.Write([]byte(newContents)); err != nil {
return "", errors.Wrapf(err, "failed to write config to file") return "", errors.Wrapf(err, "failed to write config to file")
} }
defer fWrite.Close()
return aliasEmail, nil return aliasEmail, nil
} }

1
modules/kubernetes/mailserver/extra/aliases.txt
View file

@ -1 +0,0 @@
officially-emelie-generated@viktorbarzin.me vbarzin@gmail.come