Compare commits
No commits in common. "master" and "0.5" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,2 +1 @@
|
|||
/output/*
|
||||
/.token
|
||||
|
|
30
Makefile
30
Makefile
|
@ -1,9 +1,8 @@
|
|||
VERS_MAJOR := 0
|
||||
VERS_MINOR := 6
|
||||
VERS_MINOR := 5
|
||||
VERSION := $(VERS_MAJOR).$(VERS_MINOR)
|
||||
NEW_MINOR := $$(( $(VERS_MINOR) + 1 ))
|
||||
NEW_MAJOR := $$(( $(VERS_MAJOR) + 1 ))
|
||||
GITEA_URL := https://git.abbiamoundominio.org
|
||||
|
||||
output:
|
||||
|
||||
|
@ -14,7 +13,7 @@ output/sendmail-dev: output
|
|||
go build -o output/sendmail-dev ./...
|
||||
|
||||
clean:
|
||||
rm -f output/*
|
||||
rm output/*
|
||||
|
||||
build: clean output/sendmail
|
||||
|
||||
|
@ -35,37 +34,14 @@ bumpvers-major:
|
|||
git commit -m "Bump version $(VERSION) -> $(NEW_MAJOR).$(VERS_MINOR)"
|
||||
git tag $(NEW_MAJOR).$(VERS_MINOR)
|
||||
|
||||
new-release:
|
||||
@last_tag=$$(git tag|tail -n2|head -n1); \
|
||||
diffs=$$(git log --pretty=oneline --abbrev-commit $${last_tag}..HEAD~); \
|
||||
release_id=$$(curl -X POST -s \
|
||||
"$(GITEA_URL)/api/v1/repos/blallo/sendmail/releases" \
|
||||
-H "Authorization: token $$(cat .token)" \
|
||||
-H "accept: application/json" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "{\"body\": \"${diffs}\", \"draft\": false, \"name\": \"$(VERSION)\", \"prerelease\": false, \"tag_name\": \"$(VERSION)\", \"target_commitish\": \"$$(git rev-parse HEAD)\" }" \
|
||||
| jq '.id'); \
|
||||
curl -X POST -s \
|
||||
"$(GITEA_URL)/api/v1/repos/blallo/sendmail/releases/$${release_id}/assets?name=sendmail" \
|
||||
-H "Authorization: token $$(cat .token)" \
|
||||
-H "accept: application/json" \
|
||||
-H "Content-Type: multipart/form-data" \
|
||||
-F "attachment=@output/sendmail"
|
||||
|
||||
release-min:
|
||||
make bumpvers-minor
|
||||
make build
|
||||
make docker-build
|
||||
git push unit
|
||||
git push --tags unit
|
||||
make new-release
|
||||
|
||||
release-maj:
|
||||
make bumpvers-major
|
||||
make build
|
||||
make docker-build
|
||||
git push unit
|
||||
git push --tags unit
|
||||
make new-release
|
||||
|
||||
PHONY: bumpvers-minor bumpvers-major release-min release-maj clean docker-build new-release
|
||||
PHONY: bumpvers-minor bumpvers-major release-min release-maj clean docker-build
|
||||
|
|
34
config.go
34
config.go
|
@ -3,7 +3,6 @@ package main
|
|||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
toml "github.com/pelletier/go-toml"
|
||||
)
|
||||
|
@ -34,19 +33,18 @@ func (s ServerConfig) String() string {
|
|||
}
|
||||
|
||||
type Config struct {
|
||||
Server *ServerConfig `toml:server,omitempty`
|
||||
From string `toml:from,omitempty`
|
||||
To []string `toml:to,omitempty`
|
||||
Cc []string `toml:cc,omitempty`
|
||||
Bcc []string `toml:bcc,omitempty`
|
||||
Subject string `toml:subject,omitempty`
|
||||
Text string `toml:text,omitempty`
|
||||
Attachments []string `toml:attachments,omitempty`
|
||||
Server *ServerConfig `toml:server,omitempty`
|
||||
From string `toml:from,omitempty`
|
||||
To []string `toml:to,omitempty`
|
||||
Cc []string `toml:cc,omitempty`
|
||||
Bcc []string `toml:bcc,omitempty`
|
||||
Subject string `toml:subject,omitempty`
|
||||
Text string `toml:text,omitempty`
|
||||
}
|
||||
|
||||
func (c Config) String() string {
|
||||
msg := fmt.Sprintf(
|
||||
"From: %s\nTo: %s\nCc: %s\nBcc: %s\nSubject: %s\nText:\n%s\nServer:\n%s\n",
|
||||
return fmt.Sprintf(
|
||||
"From: %s\nTo: %s\nCc: %s\nBcc: %s\nSubject: %s\nText:\n%s\nServer:\n%s",
|
||||
c.From,
|
||||
c.To,
|
||||
c.Cc,
|
||||
|
@ -55,11 +53,6 @@ func (c Config) String() string {
|
|||
c.Text,
|
||||
c.Server,
|
||||
)
|
||||
msg += "Attachments:"
|
||||
for _, attachment := range c.Attachments {
|
||||
msg += fmt.Sprintf(" - %s\n", attachment)
|
||||
}
|
||||
return msg
|
||||
}
|
||||
|
||||
func NewConfig() *Config {
|
||||
|
@ -125,15 +118,6 @@ func (c *Config) Validate() error {
|
|||
msg += fmt.Sprintf("%s: pass a value either via command line (-%s) or in configuration file section (%s)\n", v.Param, v.CmdFlag, v.ConfFlag)
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(c.Attachments) > 0 {
|
||||
for _, file := range c.Attachments {
|
||||
if _, err := os.Lstat(file); err != nil {
|
||||
msg += fmt.Sprintf("Error with attachment: %s -> %s\n", file, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
if msg != "" {
|
||||
return errors.New(msg)
|
||||
}
|
||||
return nil
|
||||
|
|
4
mail.go
4
mail.go
|
@ -19,10 +19,6 @@ func formatMessage(config *Config) *mail.Message {
|
|||
}
|
||||
m.SetHeader("Subject", config.Subject)
|
||||
m.SetBody("text/plain", config.Text)
|
||||
for _, attachment := range config.Attachments {
|
||||
Debug.F("Attacching: %s", attachment)
|
||||
m.Attach(attachment)
|
||||
}
|
||||
Debug.F("Message to deliver:\n%s", m)
|
||||
|
||||
return m
|
||||
|
|
29
main.go
29
main.go
|
@ -2,7 +2,6 @@ package main
|
|||
|
||||
import (
|
||||
"bufio"
|
||||
"errors"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
|
@ -13,27 +12,6 @@ import (
|
|||
var noVersion = "dev"
|
||||
var version string
|
||||
|
||||
type attachmentList []string
|
||||
|
||||
func (a *attachmentList) String() string {
|
||||
var str string
|
||||
for _, attachment := range *a {
|
||||
str += fmt.Sprintf("%s\n", attachment)
|
||||
}
|
||||
return str
|
||||
}
|
||||
|
||||
func (a *attachmentList) Set(file string) error {
|
||||
if _, err := os.Lstat(file); err != nil {
|
||||
return err
|
||||
}
|
||||
if file == "" {
|
||||
return errors.New("no file provided")
|
||||
}
|
||||
*a = append(*a, file)
|
||||
return nil
|
||||
}
|
||||
|
||||
func readFromConsole(result chan string) {
|
||||
var text, line string
|
||||
var err error
|
||||
|
@ -95,7 +73,6 @@ func main() {
|
|||
var encryption, dbg, versionFlag, interactive bool
|
||||
var serverPortAux int
|
||||
var serverPort int64
|
||||
var attachments attachmentList
|
||||
|
||||
flag.BoolVar(&versionFlag, "version", false, "Prints the version and exits")
|
||||
flag.StringVar(&configPath, "conf", "", "Path to a config file (defaults to /etc/sendmail.toml)")
|
||||
|
@ -112,7 +89,6 @@ func main() {
|
|||
flag.StringVar(&bcc, "bcc", "", "Comma-separated list of blind carbon-copy recipient(s)")
|
||||
flag.StringVar(&from, "from", "", "Sender of the mail (used as default account user to log in on the SMTP server)")
|
||||
flag.StringVar(&subject, "sub", "", "Subject of the mail")
|
||||
flag.Var(&attachments, "attach", "Attachment to the mail (may be repeated)")
|
||||
flag.Parse()
|
||||
|
||||
LogInit(dbg)
|
||||
|
@ -160,8 +136,7 @@ parameters:
|
|||
password: %s
|
||||
to: %s
|
||||
from: %s
|
||||
subject: %s
|
||||
attachments: %s`,
|
||||
subject: %s`,
|
||||
configPath,
|
||||
dbg,
|
||||
serverAddress,
|
||||
|
@ -172,7 +147,6 @@ parameters:
|
|||
to,
|
||||
from,
|
||||
subject,
|
||||
attachments,
|
||||
)
|
||||
|
||||
config := initializeConfig(configPath, section)
|
||||
|
@ -187,7 +161,6 @@ parameters:
|
|||
config.Merge("Bcc", toList(bcc))
|
||||
config.Merge("Subject", subject)
|
||||
config.Merge("Text", text)
|
||||
config.Merge("Attachments", attachments)
|
||||
|
||||
Debug.F("---\nPre-validation config\n%s", config)
|
||||
err = config.Validate()
|
||||
|
|
Loading…
Reference in New Issue
Block a user