From 2ebad903d239073b3dbcddf74ba6ac4db72b9f1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <inean.es@gmail.com>
Date: Thu, 11 Dec 2014 20:26:55 +0100
Subject: [PATCH] Allow custom data bag and data bag item for consul encrypt

---
 attributes/default.rb | 6 +++++-
 libraries/encrypt.rb  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index abfbaaa5..e928c420 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -61,7 +61,7 @@
 default['consul']['servers'] = []
 default['consul']['init_style'] = 'init'   # 'init', 'runit'
 
-case node['consul']['init_style'] 
+case node['consul']['init_style']
 when 'runit'
   default['consul']['service_user'] = 'consul'
   default['consul']['service_group'] = 'consul'
@@ -79,6 +79,10 @@
   "server"   => 8300,
 }
 
+# Consul DataBag
+default['consul']['data_bag'] = 'consul'
+default['consul']['data_bag_encrypt_item'] = 'encrypt'
+
 # Gossip encryption
 default['consul']['encrypt_enabled'] = false
 default['consul']['encrypt'] = nil
diff --git a/libraries/encrypt.rb b/libraries/encrypt.rb
index 632df513..8dd65488 100644
--- a/libraries/encrypt.rb
+++ b/libraries/encrypt.rb
@@ -4,7 +4,7 @@ class Recipe
     def consul_encrypted_dbi
       begin
         # loads the secret from /etc/chef/encrypted_data_bag_secret
-        Chef::EncryptedDataBagItem.load('consul', 'encrypt')
+        Chef::EncryptedDataBagItem.load(node['consul']['data_bag'], node['consul']['data_bag_encrypt_item'])
       rescue Net::HTTPServerException => e
         raise e unless e.response.code == '404'
       end