Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

Optimized service name reference. Enhance the stability of container retrieval.

Jackc93a9acf30b8
diff --git a/core/internal/cmd/cmd.go b/core/internal/cmd/cmd.go
index dd4ad542..4ae18fd4 100644
--- a/core/internal/cmd/cmd.go
+++ b/core/internal/cmd/cmd.go
@@ -95,7 +95,7 @@ var (
defer dk.Close()
- containerName := "billionmail-core-billionmail-1"
+ containerName := consts.SERVICES.Core
container, err := dk.GetContainerByName(ctx, containerName)
if err == nil {
if container.Labels != nil {
diff --git a/core/internal/consts/consts.go b/core/internal/consts/consts.go
index 822de41a..196756d3 100644
--- a/core/internal/consts/consts.go
+++ b/core/internal/consts/consts.go
@@ -18,3 +18,23 @@ const (
DOVECOT_CONF_D_PATH = "../conf/dovecot/conf.d"
SSL_PATH = "/etc/ssl/mail"
)
+
+var (
+ SERVICES = struct {
+ Pgsql string
+ Redis string
+ Rspamd string
+ Dovecot string
+ Postfix string
+ Webmail string
+ Core string
+ }{
+ Pgsql: "pgsql-billionmail",
+ Redis: "redis-billionmail",
+ Rspamd: "rspamd-billionmail",
+ Dovecot: "dovecot-billionmail",
+ Postfix: "postfix-billionmail",
+ Webmail: "webmail-billionmail",
+ Core: "core-billionmail",
+ }
+)
diff --git a/core/internal/controller/settings/settings_v1_set_ssl_config.go b/core/internal/controller/settings/settings_v1_set_ssl_config.go
index 9afa6ea2..3df3176f 100644
--- a/core/internal/controller/settings/settings_v1_set_ssl_config.go
+++ b/core/internal/controller/settings/settings_v1_set_ssl_config.go
@@ -84,7 +84,7 @@ func (c *ControllerV1) SetSSLConfig(ctx context.Context, req *v1.SetSSLConfigReq
return res, nil
}
// Restart the container
- err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, "billionmail-core-billionmail-1")
+ err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, consts.SERVICES.Core)
if err != nil {
res.SetError(gerror.New(public.LangCtx(ctx, "Failed to restart container: {}", err)))
return res, nil
diff --git a/core/internal/controller/settings/settings_v1_set_system_config.go b/core/internal/controller/settings/settings_v1_set_system_config.go
index 7799914f..5d707df5 100644
--- a/core/internal/controller/settings/settings_v1_set_system_config.go
+++ b/core/internal/controller/settings/settings_v1_set_system_config.go
@@ -1,6 +1,7 @@
package settings
import (
+ "billionmail-core/internal/consts"
"billionmail-core/internal/service/public"
"context"
"github.com/gogf/gf/v2/os/gfile"
@@ -58,7 +59,7 @@ func (c *ControllerV1) SetSystemConfig(ctx context.Context, req *v1.SetSystemCon
return res, nil
}
- err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, "billionmail-core-billionmail-1")
+ err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, consts.SERVICES.Core)
if err != nil {
res.SetError(gerror.New(public.LangCtx(ctx, "Failed to restart container: {}", err)))
diff --git a/core/internal/controller/settings/settings_v1_set_system_config_key.go b/core/internal/controller/settings/settings_v1_set_system_config_key.go
index ec8cd9a9..cb5251f4 100644
--- a/core/internal/controller/settings/settings_v1_set_system_config_key.go
+++ b/core/internal/controller/settings/settings_v1_set_system_config_key.go
@@ -1,6 +1,7 @@
package settings
import (
+ "billionmail-core/internal/consts"
"context"
"github.com/gogf/gf/os/gtimer"
"time"
@@ -43,7 +44,7 @@ func (c *ControllerV1) SetSystemConfigKey(ctx context.Context, req *v1.SetSystem
// 4. Restart the container
gtimer.AddOnce(500*time.Millisecond, func() {
- err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, "billionmail-core-billionmail-1")
+ err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, consts.SERVICES.Core)
if err != nil {
g.Log().Error(ctx, "Failed to restart container: {}", err)
return
diff --git a/core/internal/service/dockerapi/dockerapi.go b/core/internal/service/dockerapi/dockerapi.go
index fec24103..80210142 100644
--- a/core/internal/service/dockerapi/dockerapi.go
+++ b/core/internal/service/dockerapi/dockerapi.go
@@ -2,6 +2,7 @@ package docker
import (
v1 "billionmail-core/api/dockerapi/v1"
+ "billionmail-core/internal/consts"
"bytes"
"context"
"encoding/json"
@@ -202,7 +203,16 @@ func (d *DockerAPI) ExecCommandByName(ctx context.Context, name string, cmd []st
// ListContainers lists all containers
func (d *DockerAPI) ListContainers(ctx context.Context) ([]container.Summary, error) {
- return d.client.ContainerList(ctx, container.ListOptions{All: true})
+ args := filters.NewArgs()
+
+ for _, v := range gconv.Map(consts.SERVICES) {
+ args.Add("name", v.(string))
+ }
+
+ return d.client.ContainerList(ctx, container.ListOptions{
+ All: true,
+ Filters: args,
+ })
}
// GetContainerByName gets a container by its name
diff --git a/core/internal/service/domains/domains.go b/core/internal/service/domains/domains.go
index 7a9e339e..2b4efc1c 100644
--- a/core/internal/service/domains/domains.go
+++ b/core/internal/service/domains/domains.go
@@ -104,14 +104,14 @@ func Add(ctx context.Context, domain *v1.Domain) error {
}
// update postfix environment parameter
- _, err = public.DockerApiFromCtx(ctx).ExecCommandByName(ctx, "billionmail-postfix-billionmail-1", []string{"bash", "-c", fmt.Sprintf("sed -i '/^BILLIONMAIL_HOSTNAME=/d' /postfix.sh && sed -i '/^#!\\/bin\\/bash/a BILLIONMAIL_HOSTNAME=%s' /postfix.sh", public.FormatMX(domain.Domain))}, "root")
+ _, err = public.DockerApiFromCtx(ctx).ExecCommandByName(ctx, consts.SERVICES.Postfix, []string{"bash", "-c", fmt.Sprintf("sed -i '/^BILLIONMAIL_HOSTNAME=/d' /postfix.sh && sed -i '/^#!\\/bin\\/bash/a BILLIONMAIL_HOSTNAME=%s' /postfix.sh", public.FormatMX(domain.Domain))}, "root")
if err != nil {
return fmt.Errorf("failed to update BILLIONMAIL_HOSTNAME in postfix container: %v", err)
}
// restart postfix service
- err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, "billionmail-postfix-billionmail-1")
+ err = public.DockerApiFromCtx(ctx).RestartContainerByName(ctx, consts.SERVICES.Postfix)
if err != nil {
return fmt.Errorf("failed to restart postfix container: %v", err)
@@ -419,7 +419,7 @@ func GetDKIMRecord(domain string, validateImmediate bool) (record v1.DNSRecord,
defer mutex.Unlock()
var res *v2.ExecResult
- res, err = dk.ExecCommandByName(context.Background(), "billionmail-rspamd-billionmail-1", []string{"rspamadm", "dkim_keygen", "-s", "'default'", "-b", "2048", "-d", domain, "-k", fmt.Sprintf("/var/lib/rspamd/dkim/%s/default.private", domain)}, "root")
+ res, err = dk.ExecCommandByName(context.Background(), consts.SERVICES.Rspamd, []string{"rspamadm", "dkim_keygen", "-s", "'default'", "-b", "2048", "-d", domain, "-k", fmt.Sprintf("/var/lib/rspamd/dkim/%s/default.private", domain)}, "root")
if err != nil {
err = fmt.Errorf("Failed to generate DKIM key pair: %v", err)
@@ -483,7 +483,7 @@ domain {
}
// Restart rspamd service
- err = dk.RestartContainerByName(context.Background(), "billionmail-rspamd-billionmail-1")
+ err = dk.RestartContainerByName(context.Background(), consts.SERVICES.Rspamd)
if err != nil {
err = fmt.Errorf("Failed to restart rspamd container: %v", err)
@@ -800,7 +800,7 @@ func RepairDKIMSigningConfig(ctx context.Context) error {
defer dk.Close()
- err = dk.RestartContainerByName(ctx, "billionmail-rspamd-billionmail-1")
+ err = dk.RestartContainerByName(ctx, consts.SERVICES.Rspamd)
if err != nil {
return fmt.Errorf("Failed to restart rspamd container: %v", err)
}
diff --git a/core/internal/service/domains/ssl.go b/core/internal/service/domains/ssl.go
index bf6bc0b1..1af774e0 100644
--- a/core/internal/service/domains/ssl.go
+++ b/core/internal/service/domains/ssl.go
@@ -143,7 +143,7 @@ func ApplyCertToService(domain, crtPem, keyPem string) (err error) {
defer dk.Close()
- err = dk.RestartContainerByName(context.Background(), "billionmail-core-billionmail-1")
+ err = dk.RestartContainerByName(context.Background(), consts.SERVICES.Core)
}()
}
@@ -178,7 +178,7 @@ func ApplyCertToConsole(crtPem, keyPem string) (err error) {
defer dk.Close()
- err = dk.RestartContainerByName(context.Background(), "billionmail-core-billionmail-1")
+ err = dk.RestartContainerByName(context.Background(), consts.SERVICES.Core)
}()
return
diff --git a/core/internal/service/mail_service/bcc.go b/core/internal/service/mail_service/bcc.go
index ba83e1ef..8ab3265f 100644
--- a/core/internal/service/mail_service/bcc.go
+++ b/core/internal/service/mail_service/bcc.go
@@ -96,7 +96,7 @@ func SyncBccToPostfix(ctx context.Context) error {
return err
}
- postfixContainer := "billionmail-postfix-billionmail-1"
+ postfixContainer := consts.SERVICES.Postfix
dk, dockerErr := docker.NewDockerAPI()
if dockerErr != nil {
diff --git a/core/internal/service/mail_service/certificate.go b/core/internal/service/mail_service/certificate.go
index 06d70a63..ff38846c 100644
--- a/core/internal/service/mail_service/certificate.go
+++ b/core/internal/service/mail_service/certificate.go
@@ -335,7 +335,7 @@ func (c *Certificate) updatePostfixSNIMap(domain, certPath, keyPath string) erro
}
// Rehash configuration
- if _, err := c.dockerApiClient().ExecCommandByName(context.Background(), "billionmail-postfix-billionmail-1", []string{"postmap", "/etc/postfix/conf/vmail_ssl.map"}, "root"); err != nil {
+ if _, err := c.dockerApiClient().ExecCommandByName(context.Background(), consts.SERVICES.Postfix, []string{"postmap", "/etc/postfix/conf/vmail_ssl.map"}, "root"); err != nil {
return fmt.Errorf("failed to hash postfix config: %v", err)
}
@@ -440,7 +440,7 @@ func (c *Certificate) updateConfigLine(config, key, value string) string {
// restartPostfix restarts Postfix service
func (c *Certificate) restartPostfix() error {
// Restart Postfix container
- if err := c.dockerApiClient().RestartContainerByName(context.Background(), "billionmail-postfix-billionmail-1"); err != nil {
+ if err := c.dockerApiClient().RestartContainerByName(context.Background(), consts.SERVICES.Postfix); err != nil {
return fmt.Errorf("failed to restart postfix container: %v", err)
}
@@ -450,7 +450,7 @@ func (c *Certificate) restartPostfix() error {
// restartDovecot restarts Dovecot service
func (c *Certificate) restartDovecot() error {
// Restart Dovecot container
- if err := c.dockerApiClient().RestartContainerByName(context.Background(), "billionmail-dovecot-billionmail-1"); err != nil {
+ if err := c.dockerApiClient().RestartContainerByName(context.Background(), consts.SERVICES.Dovecot); err != nil {
return fmt.Errorf("failed to restart dovecot container: %v", err)
}
diff --git a/core/internal/service/mail_service/fix.go b/core/internal/service/mail_service/fix.go
index 72efb1a4..eba0ff4b 100644
--- a/core/internal/service/mail_service/fix.go
+++ b/core/internal/service/mail_service/fix.go
@@ -139,7 +139,7 @@ endif
defer dk.Close()
// Restart the Postfix container to apply the changes
- _, err = dk.ExecCommandByName(ctx, "billionmail-postfix-billionmail-1", []string{"postfix", "reload"}, "root")
+ _, err = dk.ExecCommandByName(ctx, consts.SERVICES.Postfix, []string{"postfix", "reload"}, "root")
if err != nil {
g.Log().Warning(ctx, "Failed to restart Postfix container: %v", err)
@@ -205,7 +205,7 @@ func FixRspamdDKIMSigningConfig(ctx context.Context) {
defer dk.Close()
// Restart the Rspamd container to apply the changes
- err = dk.RestartContainer(ctx, "billionmail-rspamd-billionmail-1")
+ err = dk.RestartContainer(ctx, consts.SERVICES.Rspamd)
if err != nil {
g.Log().Warning(ctx, "Failed to restart Rspamd container: %v", err)
@@ -282,7 +282,7 @@ func FixDovecotSSLConfig(ctx context.Context) {
defer dk.Close()
// Restart the Dovecot container to apply the changes
- err = dk.RestartContainer(ctx, "billionmail-dovecot-billionmail-1")
+ err = dk.RestartContainer(ctx, consts.SERVICES.Dovecot)
if err != nil {
g.Log().Warning(ctx, "Failed to restart Dovecot container: %v", err)
diff --git a/core/internal/service/relay/config_sync.go b/core/internal/service/relay/config_sync.go
index 19398e31..26424ee4 100644
--- a/core/internal/service/relay/config_sync.go
+++ b/core/internal/service/relay/config_sync.go
@@ -2,6 +2,7 @@ package relay
import (
domainsV1 "billionmail-core/api/domains/v1"
+ "billionmail-core/internal/consts"
"billionmail-core/internal/model/entity"
docker "billionmail-core/internal/service/dockerapi"
"billionmail-core/internal/service/domains"
@@ -27,7 +28,7 @@ var (
senderTransportFile = "/conf/sender_transport_relay"
mainCfFile = "main.cf"
//mainCfFileExtra = "/conf/extra.cf"
- postfixContainerName = "billionmail-postfix-billionmail-1"
+ postfixContainerName = consts.SERVICES.Postfix
)
func GetRelayEncryptionKey() (string, error) {
diff --git a/core/internal/service/rspamd/worker_controller.go b/core/internal/service/rspamd/worker_controller.go
index 89efcc54..6bb7e6b9 100644
--- a/core/internal/service/rspamd/worker_controller.go
+++ b/core/internal/service/rspamd/worker_controller.go
@@ -37,7 +37,7 @@ func InitWorkerController() (err error) {
defer dk.Close()
- res, err := dk.ExecCommandByName(context.Background(), "billionmail-rspamd-billionmail-1", []string{"rspamadm", "pw", "-p", passwordPlain}, "root")
+ res, err := dk.ExecCommandByName(context.Background(), consts.SERVICES.Rspamd, []string{"rspamadm", "pw", "-p", passwordPlain}, "root")
if err != nil {
return
@@ -66,7 +66,7 @@ static_dir = "${WWWDIR}";`)
}
// Restart the RSPAMD container
- err = dk.RestartContainer(context.Background(), "billionmail-rspamd-billionmail-1")
+ err = dk.RestartContainer(context.Background(), consts.SERVICES.Rspamd)
return
}