Merge remote-tracking branch 'remotes/origin/master' into ansible-realserver

Author: quentinmit

ansible/roles/real-httpd/files/certs/check.pl

@@ -18,6 +18,7 @@
 
 use constant WARNING => 60*60*24*14; # Warn if a cert is expiring within 14 days
 
+my @expired;
 foreach my $cert (glob("*.pem"), glob("/var/lib/scripts-certs/*.pem")) {
   open(CERT, "<", $cert);
   my $ins = do {local $/; <CERT>};
@@ -40,10 +41,16 @@
     my $time = str2time($exp);
 
     if ($verbose || ($time - $now) <= WARNING) {
-      printf "Certificate expiring in %.2f days: %s for ", (($time - $now) / (60.0*60*24)), $cert;
-      open(IN, '|-', qw(openssl x509 -subject -noout));
-      print IN $in;
-      close(IN);
+      push @expired, [$time - $now, $cert, $in];
     }
   }
 }
+
+@expired = reverse sort {$a->[0] <=> $b->[0]} @expired;
+foreach my $expired_cert (@expired) {
+  my ($age, $cert, $in) = @$expired_cert;
+  printf "Certificate expiring in %.2f days: %s for ", ($age / (60.0*60*24)), $cert;
+  open(IN, '|-', qw(openssl x509 -subject -noout));
+  print IN $in;
+  close(IN);
+}