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
Fix the pgsql query file and switch to using environment variables
lotk1e03ece6b0ef
diff --git a/core/internal/controller/relay/relay_v1_list_relay_configs.go b/core/internal/controller/relay/relay_v1_list_relay_configs.goindex 359c3735..84a53d32 100644--- a/core/internal/controller/relay/relay_v1_list_relay_configs.go+++ b/core/internal/controller/relay/relay_v1_list_relay_configs.go@@ -58,7 +58,7 @@ func (c *ControllerV1) ListRelayConfigs(ctx context.Context, req *v1.ListRelayCoRelayHost: config.RelayHost,RelayPort: config.RelayPort,AuthUser: config.AuthUser,- AuthPassword: "", // 不返回密码+ AuthPassword: "",Ip: config.Ip,Host: config.Host,Active: config.Active,diff --git a/core/internal/service/relay/config_sync.go b/core/internal/service/relay/config_sync.goindex 65d31551..4e3c3795 100644--- a/core/internal/service/relay/config_sync.go+++ b/core/internal/service/relay/config_sync.go@@ -536,28 +536,24 @@ func ensurePostfixRelayConfig(mainCfPath string, enableRelay bool) error {// createPostfixSqlConfigFilefunc createPostfixSqlConfigFile() error {+ dbpass, _ := public.DockerEnv("DBPASS")+ dbname, _ := public.DockerEnv("DBNAME")+ dbuser, _ := public.DockerEnv("DBUSER")sqlConfigFiles := map[string]string{- "pgsql_sender_relay_maps.cf": `user = billionmail-password = 5khrHLc9zxTHZPJzxWkpe2ZQpTGHgH7q+ "pgsql_sender_relay_maps.cf": fmt.Sprintf(`user = %s+password = %shosts = pgsql-dbname = billionmail+dbname = %s-query = SELECT CONCAT('[', rc.relay_host, ']:', rc.relay_port) FROM bm_relay_config rc JOIN bm_relay_domain_mapping rdm ON rc.id = rdm.relay_id WHERE rdm.sender_domain = REPLACE('%s', '@', '') AND rc.active = 1 LIMIT 1`,+query = SELECT CONCAT('[', rc.relay_host, ']:', rc.relay_port) FROM bm_relay_config rc JOIN bm_relay_domain_mapping rdm ON rc.id = rdm.relay_id WHERE rdm.sender_domain = REPLACE('%%s', '@', '') AND rc.active = 1 LIMIT 1`, dbuser, dbpass, dbname),- // "pgsql_sasl_password_maps.cf": `user = billionmail- //password = 5khrHLc9zxTHZPJzxWkpe2ZQpTGHgH7q- //hosts = pgsql- //dbname = billionmail- //- //query = SELECT CONCAT(rc.auth_user, ':', rc.auth_password) FROM bm_relay_config rc WHERE CONCAT('[', rc.relay_host, ']:', rc.relay_port) = '%s' AND rc.active = 1 LIMIT 1`,-- "pgsql_sender_transport_maps.cf": `user = billionmail-password = 5khrHLc9zxTHZPJzxWkpe2ZQpTGHgH7q+ "pgsql_sender_transport_maps.cf": fmt.Sprintf(`user = %s+password = %shosts = pgsql-dbname = billionmail+dbname = %s-query = SELECT CONCAT(smtp_name, ':') FROM bm_domain_smtp_transport WHERE domain = '%s' LIMIT 1`,+query = SELECT CONCAT(smtp_name, ':') FROM bm_domain_smtp_transport WHERE domain = '%%s' LIMIT 1`, dbuser, dbpass, dbname),}sqlDir := path.Join(postfixConfigDir, "sql")@@ -598,7 +594,6 @@ func writePostfixRelayConfig(cfPath string, enableRelay bool) error {var configBlock string- // sender_dependent_default_transport_maps = pgsql:/etc/postfix/sql/pgsql_multi_ip_domain_transport_maps.cf, pgsql:/etc/postfix/sql/pgsql_sender_transport_maps.cfconfigBlock = fmt.Sprintf(`%ssmtp_sasl_auth_enable = yessmtp_sasl_security_options = noanonymous