Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git/ Conflicts: hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java hsarback/src/de/hsadmin/mods/email/EMailAddressProcessorFactory.java
This commit is contained in:
commit
f0df8fb9a6
@ -159,9 +159,9 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
|
|||||||
|
|
||||||
private ShellProcessor createHiveEMailRemoveProcessor(String domName) {
|
private ShellProcessor createHiveEMailRemoveProcessor(String domName) {
|
||||||
return new ShellProcessor(
|
return new ShellProcessor(
|
||||||
"postmap -d '" + domName + "' /etc/postfix/virtual && " +
|
"postmap -d '" + domName + "' /etc/postfix-mailin/virtual && " +
|
||||||
"for KEY in $(postmap -s /etc/postfix/virtual|grep '@" + domName + "\\s'|cut -f1); " +
|
"for KEY in $(postmap -s /etc/postfix-mailin/virtual|grep '@" + domName + "\\s'|cut -f1); " +
|
||||||
"do postmap -d $KEY /etc/postfix/virtual; done"
|
"do postmap -d $KEY /etc/postfix-mailin/virtual; done"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user