Merge lp:~clint-fewbar/ubuntu/precise/apache2/fix-ask-for-passphrase into lp:ubuntu/precise/apache2

[Clint Byrum]

See bug report and d/changelog. Fixes script so plymouth is used as the
last resort, instead of the TTY.

[Alex Muntada (alex.muntada)]

After reviewing both the bug and the changes proposed, i agree with them.

review: Approve

=== modified file 'debian/ask-for-passphrase'
--- debian/ask-for-passphrase	2010-11-22 09:43:43 +0000
+++ debian/ask-for-passphrase	2011-12-07 00:53:25 +0000
@@ -23,16 +23,17 @@
 
 prompt="Apache needs to decrypt your SSL Keys for $sitename ($keytype)
 Please enter passphrase:"
-if [ -x /bin/plymouth ] && plymouth --ping ; then
-    echo $prompt | logger
-    exec plymouth ask-for-password --prompt="$prompt"
-else
-    tty=`tty`
+tty=`tty`
+if [ "$tty" = "not a tty" ] ; then
+    # Apache gives us a pipe for stdin, but we want to
+    # talk to apache's terminal.
+    tty=`tty < /proc/${PPID}/fd/0`
     if [ "$tty" = "not a tty" ] ; then
-        # Apache gives us a pipe for stdin, but we want to
-        # talk to apache's terminal.
-        tty=`tty < /proc/${PPID}/fd/0`
-        if [ "$tty" = "not a tty" ] ; then
+        if [ -x /bin/plymouth ] && plymouth --ping ; then
+            echo $prompt | logger
+            exec plymouth ask-for-password --prompt="$prompt"
+        else
+            logger -p daemon.err -t apache2 "No way to ask user for passphrase"
             exit 1
         fi
     fi
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-12-02 17:36:28 +0000
+++ debian/changelog	2011-12-07 00:53:25 +0000
@@ -1,3 +1,11 @@
+apache2 (2.2.21-2ubuntu3) precise; urgency=low
+
+  * d/ask-for-passphrase: Flip the logic of this script so that it checks
+    first to see if apache is being started from a TTY, and then if not,
+    tries plymouth. (LP: #887410)
+
+ -- Clint Byrum <[e-mail]>  Tue, 06 Dec 2011 16:49:33 -0800
+
 apache2 (2.2.21-2ubuntu2) precise; urgency=low
 
   * No-change rebuild to drop spurious libsfgcc1 dependency on armhf.