diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-29 22:59:27 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-29 22:59:27 -0300 |
commit | 3e3a52bb035a1447055d268f07b712b5afc16a11 (patch) | |
tree | 84719381dac6527ba6b98f6beafb94d1bfdb19bd | |
parent | a63c0a635c642fea1f2a3d41b3ef2fd51d993568 (diff) | |
download | hydra-3e3a52bb035a1447055d268f07b712b5afc16a11.tar.gz hydra-3e3a52bb035a1447055d268f07b712b5afc16a11.tar.bz2 |
Misc fixes at puppet-finger
-rwxr-xr-x | share/hydractl/puppet-finger | 12 |
1 files changed, 7 insertions, 5 deletions
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`" |