]> gitweb.fluxo.info Git - hydra.git/commitdiff
Misc fixes at puppet-finger
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 30 Sep 2011 01:59:27 +0000 (22:59 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 30 Sep 2011 01:59:27 +0000 (22:59 -0300)
share/hydractl/puppet-finger

index 1449797f916e2c83d281a0b87feca5e1e7db4f52..50165548dddfc859d4b502014819506217d17438 100755 (executable)
@@ -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`"