Misc fixes at puppet-finger

diff --git a/share/hydractl/puppet-finger b/share/hydractl/puppet-finger
index 50165548dddfc859d4b502014819506217d17438..010cca1f1a4f1e0a4868acef996e1e77f7aa7a5e 100755 (executable)
--- a/share/hydractl/puppet-finger
+++ b/share/hydractl/puppet-finger
@@ -24,15 +24,17 @@ function puppet_openssl {
 #  openssl x509 -text -noout -fingerprint -in /var/lib/puppetmaster/ssl/ca/signed/fqdn.pem
 #  openssl x509 -text -noout -fingerprint -in /var/lib/puppetmaster/ssl/certs/ca.pem
 #
-if [ -d "/var/lib/puppetmaster/ssl/" ]; then
-  if [ -d "/var/lib/puppetmaster/ssl/ca/signed/" ]; then
-    for file in `ls /var/lib/puppetmaster/ssl/ca/signed/*pem`; do
+if [ -d "/var/lib/puppetmaster/ssl" ]; then
+  if [ -d "/var/lib/puppetmaster/ssl/ca/signed" ]; then
+    for file in `ls /var/lib/puppetmaster/ssl/ca/signed`; do
       fp="`puppet_openssl $file`"
       echo "`basename $file .pem`: $fp"
     done
   fi
 
-  echo "ca: `puppet_openssl /var/lib/puppetmaster/ssl/certs/ca.pem`"
+  if [ -f "/var/lib/puppetmaster/ssl/certs/ca.pem" ]; then
+    echo "ca: `puppet_openssl /var/lib/puppetmaster/ssl/certs/ca.pem`"
+  fi
 fi
 
 # Node:
@@ -40,7 +42,7 @@ fi
 #  openssl x509 -text -noout -fingerprint -in /var/lib/puppet/ssl/certs/fqdn.pem
 #  openssl x509 -text -noout -fingerprint -in /var/lib/puppet/ssl/certs/ca.pem
 #
-if [ -d "/var/lib/puppet/ssl/" ]; then
+if [ -d "/var/lib/puppet/ssl" ]; then
   fqdn="`facter fqdn`"
   fp="`puppet_openssl /var/lib/puppet/ssl/certs/$fqdn.pem`"
   echo "$fqdn: $fp"