Eucalyptus

Merge lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config into lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic

  1. k-fix-email-config
  2. Merge into ubuntu-karmic
Proposed by Mathias Gug
Status: Superseded
Proposed branch: lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config
Merge into: lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic
Diff against target: 38 lines
2 files modified
debian/changelog (+4/-0)
debian/eucalyptus-cloud.postinst (+13/-0)
To merge this branch: bzr merge lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config
Reviewer Review Type Date Requested Status
Dustin Kirkland  Approve
Review via email: mp+14328@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

<kirkland> mathiaz: [ -x /usr/sbin/invoke-rc.d ] && INIT="invoke-rc.d postfix" ... i find this strange, as you test for the executability of a particular path, and then call the invoke-rc.d from the $PATH
<kirkland> mathiaz: i'd expect you to either check the output of which, and call the one in $PATH
<kirkland> mathiaz: or to test the executability of a full path, and call that full path

review: Needs Fixing
lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config updated
719. By Mathias Gug

Use the full path to invoke-rc.d as this is what the test used.

Revision history for this message
Dustin Kirkland  (kirkland) :
review: Approve
lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config updated
720. By Mathias Gug

Also run postconf on package installation, not just on upgrades.

721. By Mathias Gug

Merge karmic branch.

722. By Mathias Gug

Merge karmic branch.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-02 23:10:25 +0000
3+++ debian/changelog 2009-11-02 23:46:10 +0000
4@@ -11,6 +11,10 @@
5 * debian/eucalyptus-common.eucalyptus.upstart: Add -l to eucalyptus-cloud
6 options so that cloud-output.log is affected by LOGLEVEL (LP: #458001)
7
8+ [ Mathias Gug ]
9+ * debian/eucalyptus-cloud.postinst: Fix postfix configuration to accept
10+ confirmation emails sent by eucalyptus (LP: #459101)
11+
12 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +0200
13
14 eucalyptus (1.6~bzr931-0ubuntu7) karmic; urgency=low
15
16=== modified file 'debian/eucalyptus-cloud.postinst'
17--- debian/eucalyptus-cloud.postinst 2009-09-28 02:40:40 +0000
18+++ debian/eucalyptus-cloud.postinst 2009-11-02 23:46:10 +0000
19@@ -7,6 +7,19 @@
20 chmod 700 /var/lib/eucalyptus/db
21 fi
22
23+ if [ -n "$2" ] && dpkg --compare-versions "$2" lt 1.6~bzr931-0ubuntu7.1
24+ then
25+ # Fix postfix configuration to accept confirmation emails sent
26+ # by eucalyptus - LP: #459101
27+ if which postconf > /dev/null; then
28+ postconf -# "mynetworks"
29+ postconf -e "mynetworks_style=host"
30+ [ -x /usr/sbin/invoke-rc.d ] && INIT="/usr/sbin/invoke-rc.d postfix" \
31+ || INIT="/etc/init.d/postfix"
32+ ${INIT} reload
33+ fi
34+ fi
35+
36 if [ -e /etc/init/eucalyptus.conf ]; then
37 restart eucalyptus || :
38 fi

Subscribers

People subscribed via source and target branches

to all changes: