Moved /etc/postfix/virtual to /etc/postfix-mailin/virtual. Attention! The s...

Michael Hierweck

2012-08-16 06a487819fd0d58143ce5ca645e8f1e06d01588a

Moved /etc/postfix/virtual to /etc/postfix-mailin/virtual.
Attention! The static hive configuration needs to be adjusted.

 hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java

@@ -138,9 +138,9 @@

    private ShellProcessor createHiveEMailRemoveProcessor(String domName) {
        return new ShellProcessor(
            "postmap -d '" + domName + "' /etc/postfix/virtual && " + 
            "for KEY in $(postmap -s /etc/postfix/virtual|grep '@" + domName + "\\s'|cut -f1); " +
                "do postmap -d $KEY /etc/postfix/virtual; done"
            "postmap -d '" + domName + "' /etc/postfix-mailin/virtual && " + 
            "for KEY in $(postmap -s /etc/postfix-mailin/virtual|grep '@" + domName + "\\s'|cut -f1); " +
                "do postmap -d $KEY /etc/postfix-mailin/virtual; done"
            );
    }


 hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java

@@ -19,9 +19,9 @@
        // TODO: combine both keys in a single call (optimization)
        EMailAddress email = (EMailAddress) entity;
        CompoundProcessor cp = new CompoundProcessor();
        cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix/virtual",
        cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual",
                email.getFullDomain() + " -" ) );
        cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix/virtual",
        cp.appendProcessor(new ShellProcessor( "postmap -r -i /etc/postfix-mailin/virtual",
                email.getEMailAddress() + " " + email.getTarget() ) );
        if (emailAddressCount(em, email) < 2) {
            WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
@@ -47,13 +47,13 @@
        CompoundProcessor cp = new CompoundProcessor();
        EMailAddress email = (EMailAddress) entity;
        cp.appendProcessor( 
                new ShellProcessor( "postmap -d '" + email.getEMailAddress() + "' /etc/postfix/virtual" ) );
                new ShellProcessor( "postmap -d '" + email.getEMailAddress() + "' /etc/postfix-mailin/virtual" ) );
        int emailAddressCount = emailAddressCount(em, email);
        if (emailAddressCount == 0) {
            // remove the domain from virtual.db
            String fullDomain = email.getFullDomain();
            cp.appendProcessor( 
                    new ShellProcessor( "postmap -d '" + fullDomain + "' /etc/postfix/virtual" ) );
                    new ShellProcessor( "postmap -d '" + fullDomain + "' /etc/postfix-mailin/virtual" ) );
            WaitingTasksProcessor waitingTasksProcessor = new WaitingTasksProcessor(cp);
            Config config = Config.getInstance();
            for (String queueName : config.getProperty("queues.mail").split(",")) {