Version v0.4.0

+## 0.4.0 - 2016-12-13
+### Added
+- AWS bucket and region can now be specified per element of the attribute `node['backup-file2s3']['backups']`. If not specified, bucket and region will default to the global node attributes `node['backup-file2s3']['bucket']` and `node['backup-file2s3']['region']`, respectively.
+
+### Fixed
+- Fixed a logic bug when trying to determine if at least one enabled path specification is encrypted or not.
+
 ## 0.3.3 - 2016-11-29
 ## 0.3.3 - 2016-11-29
 ### Fixed
 ### Fixed
 - A typo in the backup script (missing end quotes).
 - A typo in the backup script (missing end quotes).

@@ -22,14 +22,14 @@ Ubuntu 14.04
   <tr>
   <tr>
     <td><tt>['backup-file2s3']['bucket']</tt></td>
     <td><tt>['backup-file2s3']['bucket']</tt></td>
     <td>String</td>
     <td>String</td>
-    <td>The S3 bucket where backup tarballs will be stored.</td>
+    <td>The default S3 bucket where backup tarballs will be stored.</td>
     <td><tt>nil</tt></td>
     <td><tt>nil</tt></td>
   </tr>
   </tr>
   <tr>
   <tr>
     <td><tt>['backup-file2s3']['region']</tt></td>
     <td><tt>['backup-file2s3']['region']</tt></td>
     <td>String</td>
     <td>String</td>
-    <td>AWS region of the bucket.</td>
-    <td><tt>'us-east-1'</tt></td>
+    <td>Default AWS region.</td>
+    <td><tt>nil</tt></td>
   </tr>
   </tr>
   <tr>
   <tr>
     <td><tt>['backup-file2s3']['backups']</tt></td>
     <td><tt>['backup-file2s3']['backups']</tt></td>
@@ -40,7 +40,7 @@ Ubuntu 14.04
   <tr>
   <tr>
     <td><tt>['backup-file2s3']['cron']['sched']</tt></td>
     <td><tt>['backup-file2s3']['cron']['sched']</tt></td>
     <td>String</td>
     <td>String</td>
-    <td>Crontab syntax for scheduling how often the backup script will run.</td>
+    <td>Crontab syntax for scheduling how often the backup script/s will run.</td>
     <td><tt>'0 0 * * *'</tt></td>
     <td><tt>'0 0 * * *'</tt></td>
   </tr>
   </tr>
   <tr>
   <tr>

@@ -18,8 +18,10 @@
 # limitations under the License.
 # limitations under the License.
 #
 #
 
 
-default['backup-file2s3']['bucket'] = 'bucketname'
-default['backup-file2s3']['region'] = 'us-east-1'
+# Defaults if bucket and region are not included in the specifications
+# for 'backups' or when using the 'aws_tar_extract' definition.
+default['backup-file2s3']['bucket'] = nil
+default['backup-file2s3']['region'] = nil
 
 
 # Contains hashes with details of file/directories to be backed up to S3.
 # Contains hashes with details of file/directories to be backed up to S3.
 default['backup-file2s3']['backups'] = [
 default['backup-file2s3']['backups'] = [
@@ -27,6 +29,8 @@ default['backup-file2s3']['backups'] = [
 #    :script_name => 'default', # default: 'default', but only
 #    :script_name => 'default', # default: 'default', but only
 #                               #          one default can exist at a time
 #                               #          one default can exist at a time
 #    :enable      => true # default: true
 #    :enable      => true # default: true
+#    :bucket      => nil, # default: node attribute
+#    :region      => nil, # default: node attribute
 #    :paths => [
 #    :paths => [
 #      {
 #      {
 #        :path          => '/my/dir',
 #        :path          => '/my/dir',

@@ -21,11 +21,11 @@
 # Gets a tarball from AWS S3, then unpack it into a directory.
 # Gets a tarball from AWS S3, then unpack it into a directory.
 # Parameters:
 # Parameters:
 #   :name | :file => The name of the backup tarball, without the extension
 #   :name | :file => The name of the backup tarball, without the extension
-#   :region       => AWS region
-#   :bucket       => AWS bucket
 #   :target_dir   => Where the tarball is to be unpacked. If not
 #   :target_dir   => Where the tarball is to be unpacked. If not
 #                    exists, it will be created
 #                    exists, it will be created
 #   :creates      => A file path used for idempotency
 #   :creates      => A file path used for idempotency
+#   :region       => (Optional) AWS region. Defaults to node attribute.
+#   :bucket       => (Optional) AWS bucket. Defaults to node attribute.
 #   :encrypted    => (Optional) Boolean. Whether backup files are encrypted.
 #   :encrypted    => (Optional) Boolean. Whether backup files are encrypted.
 #   :priv_key     => (Optional) String. Contents of private key, if used.
 #   :priv_key     => (Optional) String. Contents of private key, if used.
 
 

@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 license          'Apache License'
 description      'Creates a script to backup directories into an S3 bucket.'
 description      'Creates a script to backup directories into an S3 bucket.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.3.3'
+version          '0.4.0'
 
 
 depends 'awscli', '~> 1.0.1'
 depends 'awscli', '~> 1.0.1'
 depends 'cron', '~> 1.7.4'
 depends 'cron', '~> 1.7.4'

@@ -28,8 +28,13 @@ directory attribs['script_dir'] { recursive true }
 directory attribs['log_dir'] { recursive true }
 directory attribs['log_dir'] { recursive true }
 
 
 is_any_enc = attribs['backups'].any? do |back|
 is_any_enc = attribs['backups'].any? do |back|
-  back[:paths].any? do |path|
-    path[:bak_encrypted]
+  enable = back.has_key?(:enable) ? back[:enable] : true
+  if enable
+    back[:paths].any? do |path|
+      path[:bak_encrypted]
+    end
+  else
+    false
   end
   end
 end
 end
 if !attribs['encrypt']['pub_key'] && is_any_enc
 if !attribs['encrypt']['pub_key'] && is_any_enc
@@ -37,12 +42,12 @@ if !attribs['encrypt']['pub_key'] && is_any_enc
 end
 end
 
 
 file pub_key_file do
 file pub_key_file do
-  content attribs['encrypt']['pub_key']
+  content   attribs['encrypt']['pub_key']
   mode      0600
   mode      0600
   owner     'root'
   owner     'root'
   group     'root'
   group     'root'
   sensitive true
   sensitive true
-  only_if   { attribs['encrypt']['pub_key'] }
+  only_if   { is_any_enc }
 end
 end
 
 
 attribs['backups'].each do |back|
 attribs['backups'].each do |back|
@@ -57,8 +62,8 @@ attribs['backups'].each do |back|
       :aws_bin      => attribs['aws_bin'],
       :aws_bin      => attribs['aws_bin'],
       :tar_bin      => attribs['tar_bin'],
       :tar_bin      => attribs['tar_bin'],
       :tmp_dir      => attribs['tmp_dir'],
       :tmp_dir      => attribs['tmp_dir'],
-      :bucket       => attribs['bucket'],
-      :region       => attribs['region'],
+      :bucket       => back[:bucket] || attribs['bucket'],
+      :region       => back[:region] || attribs['region'],
       :pub_key_file => pub_key_file,
       :pub_key_file => pub_key_file,
       :paths        => back[:paths]
       :paths        => back[:paths]
     )
     )

@@ -18,7 +18,7 @@ region=<%= @region %>
 bak_dir=<%= @tmp_dir %>
 bak_dir=<%= @tmp_dir %>
 
 
 aws_bin=<%= @aws_bin %>
 aws_bin=<%= @aws_bin %>
-tar_bin=<%= @tar_bin || '/bin/tar' %>
+tar_bin=<%= @tar_bin %>
 
 
 pub_key_file=<%= @pub_key_file %>
 pub_key_file=<%= @pub_key_file %>