This commit is contained in:
Juergen Kunz
2025-06-29 18:47:44 +00:00
parent 405990563b
commit 7bd94884f4
6 changed files with 93 additions and 21 deletions

View File

@@ -5,7 +5,7 @@ import * as paths from './paths.js';
// Import the email server and its configuration
import { UnifiedEmailServer, type IUnifiedEmailServerOptions } from './mail/routing/classes.unified.email.server.js';
import type { IEmailRoute } from './mail/routing/interfaces.js';
import type { IEmailRoute, IEmailDomainConfig } from './mail/routing/interfaces.js';
import { logger } from './logger.js';
// Import the email configuration helpers directly from mail/delivery
import { configureEmailStorage, configureEmailServer } from './mail/delivery/index.js';
@@ -640,9 +640,28 @@ export class DcRouter {
465: 10465 // SMTPS
};
// Transform domains if they are provided as strings
let transformedDomains = this.options.emailConfig.domains;
if (transformedDomains && transformedDomains.length > 0) {
// Check if domains are strings (for backward compatibility)
if (typeof transformedDomains[0] === 'string') {
transformedDomains = (transformedDomains as any).map((domain: string) => ({
domain,
dnsMode: 'external-dns' as const,
dkim: {
selector: 'default',
keySize: 2048,
rotateKeys: false,
rotationInterval: 90
}
}));
}
}
// Create config with mapped ports
const emailConfig: IUnifiedEmailServerOptions = {
...this.options.emailConfig,
domains: transformedDomains,
ports: this.options.emailConfig.ports.map(port => portMapping[port] || port + 10000),
hostname: 'localhost' // Listen on localhost for SmartProxy forwarding
};

View File

@@ -158,7 +158,7 @@ export class UnifiedEmailServer extends EventEmitter {
private dcRouter: DcRouter;
private options: IUnifiedEmailServerOptions;
private emailRouter: EmailRouter;
private domainRegistry: DomainRegistry;
public domainRegistry: DomainRegistry;
private servers: any[] = [];
private stats: IServerStats;

View File

@@ -65,6 +65,7 @@ export class ConfigHandler {
perHour: number;
perDay: number;
};
domains?: string[];
};
dns: {
enabled: boolean;
@@ -88,6 +89,17 @@ export class ConfigHandler {
}> {
const dcRouter = this.opsServerRef.dcRouterRef;
// Get email domains if email server is configured
let emailDomains: string[] = [];
if (dcRouter.emailServer && dcRouter.emailServer.domainRegistry) {
emailDomains = dcRouter.emailServer.domainRegistry.getAllDomains();
} else if (dcRouter.options.emailConfig?.domains) {
// Fallback: get domains from email config options
emailDomains = dcRouter.options.emailConfig.domains.map(d =>
typeof d === 'string' ? d : d.domain
);
}
return {
email: {
enabled: !!dcRouter.emailServer,
@@ -98,6 +110,7 @@ export class ConfigHandler {
perHour: 100,
perDay: 1000,
},
domains: emailDomains,
},
dns: {
enabled: !!dcRouter.dnsServer,