packages: postfix/postfix.spec - restored slightly modified postconf -e rem...

[gotar]

Author: gotar                        Date: Tue Jun 16 08:14:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- restored slightly modified postconf -e removed in rev. 1.306

---- Files affected:
packages/postfix:
   postfix.spec (1.335 -> 1.336) 

---- Diffs:

================================================================
Index: packages/postfix/postfix.spec
diff -u packages/postfix/postfix.spec:1.335 packages/postfix/postfix.spec:1.336
--- packages/postfix/postfix.spec:1.335	Tue Jun  9 09:16:56 2009
+++ packages/postfix/postfix.spec	Tue Jun 16 10:14:42 2009
@@ -360,7 +360,14 @@
 	echo "Adding Entry for postmaster in %{_sysconfdir}/mail/aliases" >&2
 	echo "postmaster: root" >>%{_sysconfdir}/mail/aliases
 fi
-if [ "$1" -gt "1" ]; then
+if [ "$1" = "1" ]; then
+	# only on installation, not upgrade; set sane defaults
+	# postfix expects gethostname() to return FQDN, which is obviously wrong
+	if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/mail/main.cf; then
+		[ `/bin/hostname -d` != 'localdomain' ] && \
+			postconf -e mydomain=`/bin/hostname -d`
+	fi
+else
 	%{_sbindir}/postfix upgrade-configuration
 fi
 
@@ -519,6 +526,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.336  2009/06/16 08:14:42  gotar
+- restored slightly modified postconf -e removed in rev. 1.306
+
 Revision 1.335  2009/06/09 07:16:56  shadzik
 - 2.6.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/postfix/postfix.spec?r1=1.335&r2=1.336&f=u