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
| | |
| | | |
| | | 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" |
| | | ); |
| | | } |
| | | |