Version v0.1.2

@@ -3,8 +3,8 @@ source "https://supermarket.chef.io"
 metadata
 
 cookbook 'cfe-users', git: 'https://gitlab.chromedia.com/ops/cfe-users.git', tag: 'v0.1.1'
-cookbook 'cfe-mariadb', git: 'https://gitlab.chromedia.com/ops/cfe-mariadb.git', tag: 'v0.5.0'
-cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3.git', tag: 'v0.3.3'
+cookbook 'cfe-mariadb', git: 'https://gitlab.chromedia.com/ops/cfe-mariadb.git', tag: 'v0.5.1'
+cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3.git', tag: 'v0.4.0'
 cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.2'
 cookbook 'cfe-simple-iptables', git: 'https://gitlab.chromedia.com/ops/cfe-simple-iptables.git', tag: 'v0.1.0'
 

+## 0.1.2 - 2016-12-13
+### Changed
+- Updated dependency versions.
+- Added proper attributes to 'aws_tar_extract' definition calls to account for new version of the cookbook 'backup-file2s3'.
+
 ## 0.1.1 - 2016-12-09
 ### Added
 - Include cookbook 'cfe-simple-iptables'. Also automatically add iptables that are listed in a secret data bag (see default attribute file).

@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 description      'Simplifies setting up common Linux servers.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.1'
+version          '0.1.2'
 
 %w{
   cfe-users           cfe-mariadb 

@@ -35,25 +35,28 @@ end
 
 if node['backup-file2s3']['backups']
   node['backup-file2s3']['backups'].each do |xback|
+    xbucket = xback[:bucket]
+    xregion = xback[:region]
+
     xback[:paths].each do |xpath|
 
       # Each path spec can have the following additional attributes:
       # {
-      #   :extract     => true, # Default: true
-      #   :ex_creates  => 'filename', # Relative to path.
-      #   :ex_priv_key => nil # Default is a node attribute
+      #   :extract    => true, # Default: true
+      #   :ex_creates => 'filename' # Relative to path.
       # }
       unless xpath.has_key?(:extract) && xpath[:extract] == false
-        tdir = ::File.dirname(xpath[:path])
-        crea = "#{xpath[:path]}/#{xpath[:ex_creates]}"
-        encr = xpath[:bak_encrypted]
-        pkey = xpath.has_key?(:ex_priv_key) ? xpath[:ex_priv_key] : nil
+        ptarget_dir = ::File.dirname(xpath[:path])
+        pcreates    = "#{xpath[:path]}/#{xpath[:ex_creates]}"
+        pencrypted  = xpath[:bak_encrypted]
+        pfname      = xpath[:bak_filename] || ::File.basename(xpath[:path])
 
-        aws_tar_extract xpath[:bak_filename] do
-          target_dir tdir
-          creates    crea
-          encrypted  encr
-          priv_key   pkey
+        aws_tar_extract pfname do
+          target_dir ptarget_dir
+          creates    pcreates
+          encrypted  pencrypted
+          bucket     xbucket
+          region     xregion
         end
       end