From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Wed, 11 Apr 2018 10:21:07 +0000 (+0200)
Subject: Fixing postfix installation
X-Git-Tag: 0.1.1~57
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=9a94f16f3b555d2c05d05439a3c23381e83261a8;p=pixelpark%2Fcreate-vmware-tpl.git

Fixing postfix installation
---

diff --git a/bin/postinst b/bin/postinst
index f932402..6514e1f 100644
--- a/bin/postinst
+++ b/bin/postinst
@@ -782,9 +782,9 @@ install_postfix() {
 	root			root+${hostname}
 	root@localhost		root+${hostname}
 	icinga			icinga+${hostname}
-	icinga@localhost		icinga+${hostname}
+	icinga@localhost	icinga+${hostname}
 	nagios			nagios+${hostname}
-	nagios@localhost		nagios+${hostname}
+	nagios@localhost	nagios+${hostname}
 	xymon			xymon+${hostname}
 	xymon@localhost		xymon+${hostname}
 
@@ -802,12 +802,11 @@ install_postfix() {
     for option in "${main_options_remove[@]}" ; do
         echo "Removing postfix option '${option}' ..."
         postconf -X "${option}"
-        #sed -i -e "s/^\\(${option}( |$).*\\)/#\\1/" "/etc/postfix/main.cf"
     done
 
     for option in "${main_options_set[@]}" ; do
         echo "Setting postfix option: '${option}' ..."
-        postfix -e "${option}"
+        postconf -e "${option}"
     done
 
     mkdir -pv /var/tmp