From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 30 Sep 2011 01:59:27 +0000 (-0300)
Subject: Misc fixes at puppet-finger
X-Git-Tag: 0.1~231
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3e3a52bb035a1447055d268f07b712b5afc16a11;p=hydra.git

Misc fixes at puppet-finger
---

diff --git a/share/hydractl/puppet-finger b/share/hydractl/puppet-finger
index 1449797..5016554 100755
--- a/share/hydractl/puppet-finger
+++ b/share/hydractl/puppet-finger
@@ -25,10 +25,12 @@ function puppet_openssl {
 #  openssl x509 -text -noout -fingerprint -in /var/lib/puppetmaster/ssl/certs/ca.pem
 #
 if [ -d "/var/lib/puppetmaster/ssl/" ]; then
-  for file in `ls /var/lib/puppetmaster/ssl/ca/signed/*pem`; do
-    fp="`puppet_openssl $file`"
-    echo "`basename $file .pem`: $fp"
-  done
+  if [ -d "/var/lib/puppetmaster/ssl/ca/signed/" ]; then
+    for file in `ls /var/lib/puppetmaster/ssl/ca/signed/*pem`; do
+      fp="`puppet_openssl $file`"
+      echo "`basename $file .pem`: $fp"
+    done
+  fi
 
   echo "ca: `puppet_openssl /var/lib/puppetmaster/ssl/certs/ca.pem`"
 fi
@@ -40,7 +42,7 @@ fi
 #
 if [ -d "/var/lib/puppet/ssl/" ]; then
   fqdn="`facter fqdn`"
-  fp="`puppet_openssl /var/lib/puppetmaster/ssl/ca/signed/$fqdn.pem`"
+  fp="`puppet_openssl /var/lib/puppet/ssl/certs/$fqdn.pem`"
   echo "$fqdn: $fp"
 
   echo "ca: `puppet_openssl /var/lib/puppet/ssl/certs/ca.pem`"