hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Maybe fixed: update relay_recipients when email address is created or deleted.

Browse Source
This commit is contained in:
Michael Hierweck 2017-09-08 12:43:24 +02:00
parent 7daa01ae23
commit c7fbfcc85c
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
View File

@ -22,11 +22,11 @@ public class EMailAddressProcessorFactory implements EntityProcessorFactory {
Pac pac = email.getDomain().getUser().getPac(); Pac pac = email.getDomain().getUser().getPac();
CompoundProcessor cp = new CompoundProcessor(); CompoundProcessor cp = new CompoundProcessor();
cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual", cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual",
email.getFullDomain() + " -" ) ); email.getFullDomain() + " -" ) );
WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
Config config = Config.getInstance(); Config config = Config.getInstance();
cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual", cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual",
email.getEMailAddress() + " " + email.getTarget() ) ); email.getEMailAddress() + " " + email.getTarget() ) );
WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
for (String queueName : config.getProperty("queues.mail").split(",")) { for (String queueName : config.getProperty("queues.mail").split(",")) {
waitingTasksProcessor.appendProcessor(queueName, new ShellProcessor( "postmap -r -i /etc/postfix-mailin/relayrecipients", waitingTasksProcessor.appendProcessor(queueName, new ShellProcessor( "postmap -r -i /etc/postfix-mailin/relayrecipients",
email.getEMailAddress() + " anything" ), "Add to relayrecipients" ); email.getEMailAddress() + " anything" ), "Add to relayrecipients" );
@ -35,11 +35,9 @@ public class EMailAddressProcessorFactory implements EntityProcessorFactory {
String domName = email.getDomain().getName(); String domName = email.getDomain().getName();
for (String queueName : config.getProperty("queues.mail").split(",")) { for (String queueName : config.getProperty("queues.mail").split(",")) {
waitingTasksProcessor.appendProcessor(queueName, createMailinSetupProcessor(domName, pac), queueName + ".hostsharing.net"); waitingTasksProcessor.appendProcessor(queueName, createMailinSetupProcessor(domName, pac), queueName + ".hostsharing.net");
} }
return waitingTasksProcessor;
} else {
return cp;
} }
return waitingTasksProcessor;
} }
public <T extends AbstractEntity> Processor createUpdateProcessor(EntityManager em, T entity) { public <T extends AbstractEntity> Processor createUpdateProcessor(EntityManager em, T entity) {
@ -60,8 +58,7 @@ public class EMailAddressProcessorFactory implements EntityProcessorFactory {
new ShellProcessor( "postmap -d '" + email.getEMailAddress() + "' /etc/postfix-mailin/relayrecipients" ), new ShellProcessor( "postmap -d '" + email.getEMailAddress() + "' /etc/postfix-mailin/relayrecipients" ),
"Remove from relayrecipients" ); "Remove from relayrecipients" );
} }
int emailAddressCount = emailAddressCount(em, email); if (emailAddressCount(em, email) == 0) {
if (emailAddressCount == 0) {
// remove the domain from virtual.db // remove the domain from virtual.db
String fullDomain = email.getFullDomain(); String fullDomain = email.getFullDomain();
cp.appendProcessor( cp.appendProcessor(
@ -69,10 +66,8 @@ public class EMailAddressProcessorFactory implements EntityProcessorFactory {
for (String queueName : config.getProperty("queues.mail").split(",")) { for (String queueName : config.getProperty("queues.mail").split(",")) {
waitingTasksProcessor.appendProcessor(queueName, createMailinDeleteProcessor(fullDomain), queueName + ".hostsharing.net"); waitingTasksProcessor.appendProcessor(queueName, createMailinDeleteProcessor(fullDomain), queueName + ".hostsharing.net");
} }
return waitingTasksProcessor;
} else {
return cp;
} }
return waitingTasksProcessor;
} }
private int emailAddressCount(EntityManager em, EMailAddress email) { private int emailAddressCount(EntityManager em, EMailAddress email) {