diff --git a/Makefile b/Makefile index 7fbe8fa..35884fa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -DOCKER_REPOSITORY ?= docker.io/bornholm +DOCKER_REPOSITORY ?= reg.cadoles.com/cadoles YQ_VERSION ?= v4.30.4 YQ_BINARY ?= yq_linux_amd64 diff --git a/README.md b/README.md index a38d848..5512fcc 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Serveur SMTP factice pour le développement avec interface web. ### Avec Docker ```bash -docker run -it --rm -p 8080:8080 -p 2525:2525 bornholm/fake-smtp +docker run -it --rm -p 8080:8080 -p 2525:2525 reg.cadoles.com/cadoles/fake-smtp ``` L'interface Web sera accessible à l'adresse http://localhost:8080/. @@ -58,15 +58,15 @@ data: # Configuration du relais SMTP relay: - enabled: false # Activer/désactiver le relais SMTP - address: "" # Adresse du serveur au format "host:port" - identity: "" # Identité du compte utilisateur, peut être laissé vide - username: "" # Identifiant du compte SMTP, non utilisé sur anonymous = true - password: "" # Mot de passe du compte SMTP, non utilisé sur anonymous = true - anonymous: false # Utiliser le mode d'authentification "anonyme" - useTLS: false # Utiliser TLS pour se connecter au serveur SMTP - insecureSkipVerify: true # Ne pas vérifier le certificat du serveur pour les connexions TLS/STARTTLS - fromOverride: "" # Surcharger l'adresse émetteur des courriels transmis + enabled: false # Activer/désactiver le relais SMTP + address: "" # Adresse du serveur au format "host:port" + identity: "" # Identité du compte utilisateur, peut être laissé vide + username: "" # Identifiant du compte SMTP, non utilisé sur anonymous = true + password: "" # Mot de passe du compte SMTP, non utilisé sur anonymous = true + anonymous: false # Utiliser le mode d'authentification "anonyme" + useTLS: false # Utiliser TLS pour se connecter au serveur SMTP + insecureSkipVerify: true # Ne pas vérifier le certificat du serveur pour les connexions TLS/STARTTLS + fromOverride: "" # Surcharger l'adresse émetteur des courriels transmis ``` ### Variables d'environnement @@ -75,36 +75,36 @@ La configuration de FakeSMTP peut être personnalisée via des variables d'envir Les valeurs des variables d'environnement surchargent les valeurs présentes dans le fichier de configuration. -|Variable|Correspondance dans le fichier de configuration| -|--------|-----------------------------------------------| -|`FAKESMTP_HTTP_ADDRESS`|`http.address`| -|`FAKESMTP_HTTP_TEMPLATEDIR`|`http.templateDir`| -|`FAKESMTP_HTTP_PUBLICDIR`|`http.publicDir`| -|`FAKESMTP_SMTP_ADDRESS`|`smtp.address`| -|`FAKESMTP_SMTP_USERNAME`|`smtp.username`| -|`FAKESMTP_SMTP_PASSWORD`|`smtp.password`| -|`FAKESMTP_SMTP_DOMAIN`|`smtp.domain`| -|`FAKESMTP_SMTP_READTIMEOUT`|`smtp.readTimeout`| -|`FAKESMTP_SMTP_WRITETIMEOUT`|`smtp.writeTimeout`| -|`FAKESMTP_SMTP_MAXMESSAGEBYTES`|`smtp.maxMessageBytes`| -|`FAKESMTP_SMTP_MAXRECIPIENTS`|`smtp.maxRecipients`| -|`FAKESMTP_SMTP_ALLOWINSECUREAUTH`|`smtp.allowInsecureAuth`| -|`FAKESMTP_SMTP_DEBUG`|`smtp.debug`| -|`FAKESMTP_DATA_PATH`|`data.path`| -|`FAKESMTP_RELAY_ENABLED`|`relay.enabled`| -|`FAKESMTP_RELAY_ADDRESS`|`relay.address`| -|`FAKESMTP_RELAY_IDENTITY`|`relay.identity`| -|`FAKESMTP_RELAY_USERNAME`|`relay.username`| -|`FAKESMTP_RELAY_PASSWORD`|`relay.password`| -|`FAKESMTP_RELAY_ANONYMOUS`|`relay.anonymous`| -|`FAKESMTP_RELAY_INSECURE_SKIP_VERIFY`|`relay.insecureSkipVerify`| -|`FAKESMTP_RELAY_FROM_OVERRIDE`|`relay.fromOverride`| +| Variable | Correspondance dans le fichier de configuration | +| ------------------------------------- | ----------------------------------------------- | +| `FAKESMTP_HTTP_ADDRESS` | `http.address` | +| `FAKESMTP_HTTP_TEMPLATEDIR` | `http.templateDir` | +| `FAKESMTP_HTTP_PUBLICDIR` | `http.publicDir` | +| `FAKESMTP_SMTP_ADDRESS` | `smtp.address` | +| `FAKESMTP_SMTP_USERNAME` | `smtp.username` | +| `FAKESMTP_SMTP_PASSWORD` | `smtp.password` | +| `FAKESMTP_SMTP_DOMAIN` | `smtp.domain` | +| `FAKESMTP_SMTP_READTIMEOUT` | `smtp.readTimeout` | +| `FAKESMTP_SMTP_WRITETIMEOUT` | `smtp.writeTimeout` | +| `FAKESMTP_SMTP_MAXMESSAGEBYTES` | `smtp.maxMessageBytes` | +| `FAKESMTP_SMTP_MAXRECIPIENTS` | `smtp.maxRecipients` | +| `FAKESMTP_SMTP_ALLOWINSECUREAUTH` | `smtp.allowInsecureAuth` | +| `FAKESMTP_SMTP_DEBUG` | `smtp.debug` | +| `FAKESMTP_DATA_PATH` | `data.path` | +| `FAKESMTP_RELAY_ENABLED` | `relay.enabled` | +| `FAKESMTP_RELAY_ADDRESS` | `relay.address` | +| `FAKESMTP_RELAY_IDENTITY` | `relay.identity` | +| `FAKESMTP_RELAY_USERNAME` | `relay.username` | +| `FAKESMTP_RELAY_PASSWORD` | `relay.password` | +| `FAKESMTP_RELAY_ANONYMOUS` | `relay.anonymous` | +| `FAKESMTP_RELAY_INSECURE_SKIP_VERIFY` | `relay.insecureSkipVerify` | +| `FAKESMTP_RELAY_FROM_OVERRIDE` | `relay.fromOverride` | ## Démarrer avec les sources ### Dépendances -- Go 1.13 +- Go 1.21 - modd - make - NodeJS/npm @@ -128,4 +128,4 @@ make release ## Licence -AGPL-3.0 \ No newline at end of file +AGPL-3.0 diff --git a/cmd/fake-smtp/container.go b/cmd/fake-smtp/container.go index 6cca16e..724a957 100644 --- a/cmd/fake-smtp/container.go +++ b/cmd/fake-smtp/container.go @@ -3,10 +3,10 @@ package main import ( "gitlab.com/wpetit/goweb/template/html" - "forge.cadoles.com/wpetit/fake-smtp/internal/command" - "forge.cadoles.com/wpetit/fake-smtp/internal/config" - "forge.cadoles.com/wpetit/fake-smtp/internal/query" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/command" + "forge.cadoles.com/Cadoles/fake-smtp/internal/config" + "forge.cadoles.com/Cadoles/fake-smtp/internal/query" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "gitlab.com/wpetit/goweb/cqrs" "gitlab.com/wpetit/goweb/service" "gitlab.com/wpetit/goweb/service/build" diff --git a/cmd/fake-smtp/main.go b/cmd/fake-smtp/main.go index 08e5b58..de5bb80 100644 --- a/cmd/fake-smtp/main.go +++ b/cmd/fake-smtp/main.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "forge.cadoles.com/wpetit/fake-smtp/internal/route" + "forge.cadoles.com/Cadoles/fake-smtp/internal/route" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "gitlab.com/wpetit/goweb/middleware/container" @@ -14,7 +14,7 @@ import ( "os" - "forge.cadoles.com/wpetit/fake-smtp/internal/config" + "forge.cadoles.com/Cadoles/fake-smtp/internal/config" "github.com/pkg/errors" ) diff --git a/cmd/fake-smtp/smtp.go b/cmd/fake-smtp/smtp.go index e299a81..a265ad8 100644 --- a/cmd/fake-smtp/smtp.go +++ b/cmd/fake-smtp/smtp.go @@ -6,8 +6,8 @@ import ( "log" "os" - "forge.cadoles.com/wpetit/fake-smtp/internal/command" - "forge.cadoles.com/wpetit/fake-smtp/internal/config" + "forge.cadoles.com/Cadoles/fake-smtp/internal/command" + "forge.cadoles.com/Cadoles/fake-smtp/internal/config" "github.com/emersion/go-smtp" "github.com/jhillyerd/enmime" "github.com/pkg/errors" diff --git a/cmd/fake-smtp/template/blocks/footer.html.tmpl b/cmd/fake-smtp/template/blocks/footer.html.tmpl index a9ccfc1..d9b1c12 100644 --- a/cmd/fake-smtp/template/blocks/footer.html.tmpl +++ b/cmd/fake-smtp/template/blocks/footer.html.tmpl @@ -5,6 +5,6 @@ Date de construction: {{ .BuildInfo.BuildDate }}

- Propulsé par FakeSMTP et publié sous licence AGPL-3.0. + Propulsé par FakeSMTP et publié sous licence AGPL-3.0.

{{end}} \ No newline at end of file diff --git a/go.mod b/go.mod index aaeb3eb..1ca5b4d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module forge.cadoles.com/wpetit/fake-smtp +module forge.cadoles.com/Cadoles/fake-smtp go 1.21 diff --git a/internal/command/clear_inbox.go b/internal/command/clear_inbox.go index d93eac7..846618e 100644 --- a/internal/command/clear_inbox.go +++ b/internal/command/clear_inbox.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "gitlab.com/wpetit/goweb/cqrs" "gitlab.com/wpetit/goweb/middleware/container" ) diff --git a/internal/command/delete_email.go b/internal/command/delete_email.go index 3ab208c..a2e5939 100644 --- a/internal/command/delete_email.go +++ b/internal/command/delete_email.go @@ -5,8 +5,8 @@ import ( "github.com/pkg/errors" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "gitlab.com/wpetit/goweb/cqrs" "gitlab.com/wpetit/goweb/middleware/container" ) diff --git a/internal/command/relay_email.go b/internal/command/relay_email.go index 471cc24..f6175b1 100644 --- a/internal/command/relay_email.go +++ b/internal/command/relay_email.go @@ -10,7 +10,7 @@ import ( "github.com/emersion/go-smtp" - "forge.cadoles.com/wpetit/fake-smtp/internal/config" + "forge.cadoles.com/Cadoles/fake-smtp/internal/config" "github.com/jhillyerd/enmime" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/cqrs" diff --git a/internal/command/store_email.go b/internal/command/store_email.go index d5c9bf8..402eeec 100644 --- a/internal/command/store_email.go +++ b/internal/command/store_email.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "github.com/jhillyerd/enmime" "gitlab.com/wpetit/goweb/cqrs" "gitlab.com/wpetit/goweb/middleware/container" diff --git a/internal/query/filter_emails_test.go b/internal/query/filter_emails_test.go index 79f01c7..00f6784 100644 --- a/internal/query/filter_emails_test.go +++ b/internal/query/filter_emails_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" "github.com/pkg/errors" ) diff --git a/internal/query/get_inbox.go b/internal/query/get_inbox.go index ef35fa5..33a0941 100644 --- a/internal/query/get_inbox.go +++ b/internal/query/get_inbox.go @@ -5,8 +5,8 @@ import ( "strings" "time" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" stormdb "github.com/asdine/storm/v3" "github.com/asdine/storm/v3/q" "github.com/pkg/errors" diff --git a/internal/query/open_email.go b/internal/query/open_email.go index 2a7d08a..f72c748 100644 --- a/internal/query/open_email.go +++ b/internal/query/open_email.go @@ -3,8 +3,8 @@ package query import ( "context" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/cqrs" "gitlab.com/wpetit/goweb/middleware/container" diff --git a/internal/route/api.go b/internal/route/api.go index 1f5f1b9..5a4527e 100644 --- a/internal/route/api.go +++ b/internal/route/api.go @@ -3,8 +3,8 @@ package route import ( "net/http" - "forge.cadoles.com/wpetit/fake-smtp/internal/query" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/query" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/api" "gitlab.com/wpetit/goweb/cqrs" diff --git a/internal/route/email.go b/internal/route/email.go index 3d003ad..24c8470 100644 --- a/internal/route/email.go +++ b/internal/route/email.go @@ -7,10 +7,10 @@ import ( "github.com/microcosm-cc/bluemonday" - "forge.cadoles.com/wpetit/fake-smtp/internal/command" - "forge.cadoles.com/wpetit/fake-smtp/internal/model" - "forge.cadoles.com/wpetit/fake-smtp/internal/query" - "forge.cadoles.com/wpetit/fake-smtp/internal/storm" + "forge.cadoles.com/Cadoles/fake-smtp/internal/command" + "forge.cadoles.com/Cadoles/fake-smtp/internal/model" + "forge.cadoles.com/Cadoles/fake-smtp/internal/query" + "forge.cadoles.com/Cadoles/fake-smtp/internal/storm" "github.com/go-chi/chi/v5" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/cqrs" diff --git a/internal/route/helper.go b/internal/route/helper.go index 0308995..faa104f 100644 --- a/internal/route/helper.go +++ b/internal/route/helper.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "forge.cadoles.com/wpetit/fake-smtp/internal/config" - "forge.cadoles.com/wpetit/fake-smtp/internal/query" + "forge.cadoles.com/Cadoles/fake-smtp/internal/config" + "forge.cadoles.com/Cadoles/fake-smtp/internal/query" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service" diff --git a/internal/route/inbox.go b/internal/route/inbox.go index cd49aa5..877535f 100644 --- a/internal/route/inbox.go +++ b/internal/route/inbox.go @@ -3,8 +3,8 @@ package route import ( "net/http" - "forge.cadoles.com/wpetit/fake-smtp/internal/command" - "forge.cadoles.com/wpetit/fake-smtp/internal/query" + "forge.cadoles.com/Cadoles/fake-smtp/internal/command" + "forge.cadoles.com/Cadoles/fake-smtp/internal/query" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/cqrs" "gitlab.com/wpetit/goweb/logger" diff --git a/internal/route/mount.go b/internal/route/mount.go index 50664ec..05e71b6 100644 --- a/internal/route/mount.go +++ b/internal/route/mount.go @@ -1,7 +1,7 @@ package route import ( - "forge.cadoles.com/wpetit/fake-smtp/internal/config" + "forge.cadoles.com/Cadoles/fake-smtp/internal/config" "github.com/go-chi/chi/v5" "gitlab.com/wpetit/goweb/static"