v0.2.3

3ofcoins · Apr 9, 2014 · 28d6ae2 · 28d6ae2
1 parent 0b48465
commit 28d6ae2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Change History
 ==============
 
+0.2.3
+-----
+ - Fix bugs
+
 0.2.2
 -----
  - Moved rake task to files/ to have it packaged

diff --git a/files/tasks/ssl-key-vault.rake b/files/tasks/ssl-key-vault.rake
@@ -2,6 +2,8 @@ CERTIFICATE_DIR = 'config/certificates' unless defined? CERTIFICATE_DIR
 # CERTIFICATE_SUBJ = nil
 CERTIFICATE_JSON = FileList[File.join(CERTIFICATE_DIR, '*.key')].ext('json')
 
+autoload :JSON, 'json'
+
 rule '.json' => [ '.key', '.crt' ] do |t|
   basepath = File.join(File.dirname(t.name), File.basename(t.name, '.json'))
   inputs = Dir["#{basepath}.*"].reject { |path| path == t.name || path =~ /~$/ }

diff --git a/metadata.rb b/metadata.rb
@@ -4,6 +4,6 @@
 license          'MIT'
 description      "SSL key & certificate storage in chef-vault"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.2.2'
+version          '0.2.3'
 
 supports 'ubuntu'
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -21,7 +21,12 @@
 end
 
 node['ssl_certificates'].to_hash.each do |name, certificates|
-  item = ChefVault::Item.load('certs', "ssl-key-#{name.gsub(/[^a-z0-9]/, '_')}")
+  begin
+    item = ChefVault::Item.load('certs', "ssl-key-#{name.gsub(/[^a-z0-9]/, '_')}")
+  rescue ChefVault::Exceptions::KeysNotFound, ChefVault::Exceptions::SecretDecryption
+    node.save
+    raise
+  end
 
   certificates =
     case certificates