Version v0.5.1. Make some attributes optional.

+## 0.5.1 - 2016-12-13
+### Changed
+- Attributes :bak_filename and :bak_maxcopies are now optional in the 'db_map' specifications.
+### Added
+- Node attribute node['cfe-mariadb']['reload']['force'] will now override idempotent run for recipe 'reload_from_s3' if set to true.
+
 ## 0.5.0
 ## 0.5.0
 ### Added
 ### Added
 - Add boolean attributes ':backup' and ':reload' to db_map. They give the option of whether or not to include that database when using the 'backup2s3' and 'reload_from_s3' recipes, respectively.
 - Add boolean attributes ':backup' and ':reload' to db_map. They give the option of whether or not to include that database when using the 'backup2s3' and 'reload_from_s3' recipes, respectively.

@@ -67,6 +67,12 @@ Ubuntu 14.04
     <td><tt>nil</tt></td>
     <td><tt>nil</tt></td>
   </tr>
   </tr>
   <tr>
   <tr>
+    <td><tt>['cfe-mariadb']['reload']['false']</tt></td>
+    <td>Boolean</td>
+    <td>If the recipe 'reload_from_s3' is run, reload the databases even if it has already been done by a previous run of this recipe.</td>
+    <td><tt>false</tt></td>
+  </tr>
+  <tr>
     <td><tt>['cfe-mariadb']['encrypt']['priv_key']</tt></td>
     <td><tt>['cfe-mariadb']['encrypt']['priv_key']</tt></td>
     <td>String</td>
     <td>String</td>
     <td>Contents of the private key file used by recipe `reload_from_s3` if encrypted backups are used.</td>
     <td>Contents of the private key file used by recipe `reload_from_s3` if encrypted backups are used.</td>

@@ -23,10 +23,10 @@
 #   'example_db_name' => {
 #   'example_db_name' => {
 #     :db_user       => 'example_db_username',
 #     :db_user       => 'example_db_username',
 #     :db_pass       => 'example_db_password',
 #     :db_pass       => 'example_db_password',
-#     :bak_filename  => 'example_db_name.sql',
-#     :bak_maxcopies => 30
 
 
 ## Optional:
 ## Optional:
+#     :bak_filename  => 'example_db_name.sql', # Defaults to {dbname}.sql
+#     :bak_maxcopies => 30
 #     :char_set      => 'utf8',
 #     :char_set      => 'utf8',
 #     :collate       => 'utf8_general_ci',
 #     :collate       => 'utf8_general_ci',
 #     :bak_encrypted => false,
 #     :bak_encrypted => false,
@@ -73,6 +73,7 @@ default['cfe-mariadb']['backup']['logrotate']['options']  = %w{
   notifempty
   notifempty
 }
 }
 
 
+default['cfe-mariadb']['reload']['force'] = false
 default['cfe-mariadb']['reload']['file_stamp'] =
 default['cfe-mariadb']['reload']['file_stamp'] =
   "#{node['mariadb']['configuration']['path']}/reloaded.stamp"
   "#{node['mariadb']['configuration']['path']}/reloaded.stamp"
 
 

@@ -4,7 +4,7 @@ maintainer_email 'sysadmin @ chromedia.com'
 license          'Apache License'
 license          'Apache License'
 description      'Simplifies setup of MariaDB in Chromedia.'
 description      'Simplifies setup of MariaDB in Chromedia.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.5.0'
+version          '0.5.1'
 
 
 {
 {
   'mariadb'         => '0.3.1',
   'mariadb'         => '0.3.1',

@@ -31,7 +31,9 @@ manual_creds = node['cfe-mariadb'].has_key?('reload') &&
 tmp_dir       = ::File.join(Chef::Config[:file_cache_path], 'db_dumps')
 tmp_dir       = ::File.join(Chef::Config[:file_cache_path], 'db_dumps')
 priv_key_file = "#{tmp_dir}/priv.key"
 priv_key_file = "#{tmp_dir}/priv.key"
 
 
-unless ::File.exist?(node['cfe-mariadb']['reload']['file_stamp'])
+if node['cfe-mariadb']['reload']['force'] || 
+   !::File.exist?(node['cfe-mariadb']['reload']['file_stamp'])
+
   directory(tmp_dir) { recursive true }
   directory(tmp_dir) { recursive true }
 
 
   file priv_key_file do
   file priv_key_file do
@@ -50,8 +52,9 @@ unless ::File.exist?(node['cfe-mariadb']['reload']['file_stamp'])
     end
     end
 
 
     unless dbx.has_key?(:reload) && dbx[:reload] == false
     unless dbx.has_key?(:reload) && dbx[:reload] == false
-      keyname  = "#{dbx[:bak_filename]}.gz#{dbx[:bak_encrypted] ? '.enc' : ''}"
-      filepath = "#{tmp_dir}/#{dbx[:bak_filename]}"
+      bfname   = dbx[:bak_filename] || "#{dbx_name}.sql"
+      keyname  = "#{bfname}.gz#{dbx[:bak_encrypted] ? '.enc' : ''}"
+      filepath = "#{tmp_dir}/#{bfname}"
 
 
       awscli_s3_file "#{tmp_dir}/#{keyname}" do
       awscli_s3_file "#{tmp_dir}/#{keyname}" do
         region node['cfe-mariadb']['s3_region']
         region node['cfe-mariadb']['s3_region']
@@ -84,8 +87,11 @@ unless ::File.exist?(node['cfe-mariadb']['reload']['file_stamp'])
       file("#{filepath}.gz.enc") { action :nothing }
       file("#{filepath}.gz.enc") { action :nothing }
       file(filepath) { action :nothing }
       file(filepath) { action :nothing }
 
 
-      file node['cfe-mariadb']['reload']['file_stamp'] do
+      stamp = node['cfe-mariadb']['reload']['file_stamp']
+      file stamp do
         content %x{ date +"%FT%T" }
         content %x{ date +"%FT%T" }
+        only_if "test -d #{::File.dirname(stamp)} || "\
+                "mkdir -p #{::File.dirname(stamp)}"
       end
       end
     end
     end
   end
   end

@@ -107,6 +107,9 @@ upload_to_s3() {
 }
 }
 
 
 # First, perform mysqldump on each database (and encrypt if desired):
 # First, perform mysqldump on each database (and encrypt if desired):
+#     export_db mydb dbuser 'dbpass' mydb.sql
+#     compress_backup_file mydb.sql
+#     encrypt_file mydb.sql.gz
 
 
 <% @db_map.each do |db| -%>
 <% @db_map.each do |db| -%>
 <%   if db.is_a?(Array) -%>
 <%   if db.is_a?(Array) -%>
@@ -116,26 +119,35 @@ upload_to_s3() {
 <%     db_name = db[:db_name] -%>
 <%     db_name = db[:db_name] -%>
 <%   end -%>
 <%   end -%>
 <%   unless db.has_key?(:backup) && db[:backup] == false -%>
 <%   unless db.has_key?(:backup) && db[:backup] == false -%>
-export_db <%= db_name %> <%= db[:db_user] %> '<%= db[:db_pass] %>' <%= db[:bak_filename] %>
-compress_backup_file <%= db[:bak_filename] %>
+<%     bfname = db[:bak_filename] || "#{db_name}.sql" -%>
+export_db <%= db_name %> <%= db[:db_user] %> '<%= db[:db_pass] %>' <%= bfname %>
+compress_backup_file <%= bfname %>
 <%     if db[:bak_encrypted] -%>
 <%     if db[:bak_encrypted] -%>
-encrypt_file <%= db[:bak_filename] %>.gz
+encrypt_file <%= bfname %>.gz
 <%     end -%>
 <%     end -%>
 <%   end -%>
 <%   end -%>
 <% end -%>
 <% end -%>
 
 
 # Then upload the backup files one by one:
 # Then upload the backup files one by one:
+#     increment_backup_names mydb.sql.gz.enc 30
+#     upload_to_s3 mydb.sql.gz.enc
 
 
 <% @db_map.each do |db| -%>
 <% @db_map.each do |db| -%>
-<%   if db.is_a?(Array) then db = db[1] end -%>
-<%   if db[:bak_encrypted] -%>
-<%     bfname = "#{db[:bak_filename]}.gz.enc" -%>
+<%   if db.is_a?(Array) -%>
+<%     db_name = db[0] -%>
+<%     db = db[1] -%>
 <%   else -%>
 <%   else -%>
-<%     bfname = "#{db[:bak_filename]}.gz" -%>
+<%     db_name = db[:db_name] -%>
 <%   end -%>
 <%   end -%>
 <%   unless db.has_key?(:backup) && db[:backup] == false -%>
 <%   unless db.has_key?(:backup) && db[:backup] == false -%>
-increment_backup_names <%= bfname %> <%= db[:bak_maxcopies] %>
-upload_to_s3 <%= bfname %>
+<%     bfname = db[:bak_filename] || "#{db_name}.sql" -%>
+<%     if db[:bak_encrypted] -%>
+<%       fullname = "#{bfname}.gz.enc" -%>
+<%     else -%>
+<%       fullname = "#{bfname}.gz" -%>
+<%     end -%>
+increment_backup_names <%= fullname %> <%= db[:bak_maxcopies] || 30 %>
+upload_to_s3 <%= fullname %>
 
 
 <%   end -%>
 <%   end -%>
 <% end -%>
 <% end -%>