Version v0.5.0. Make recipe reload_from_s3 more idempotent.

+## 0.5.0
+### 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.
+- Use a timestamp file for idempotency checks for recipe 'reload_from_s3'.
+
 ## 0.4.1
 ## 0.4.1
 ### Fixed
 ### Fixed
 - Logic bug in backup script template where only the last database gets backed up.
 - Logic bug in backup script template where only the last database gets backed up.

@@ -94,8 +94,8 @@ Example config of a single database:
     :bak_filename  => 'example_db_name.sql',
     :bak_filename  => 'example_db_name.sql',
     :bak_maxcopies => 30
     :bak_maxcopies => 30
     :bak_encrypted => false,
     :bak_encrypted => false,
-    :char_set      => 'latin1',
-    :collate       => 'latin1_swedish_ci'
+    :char_set      => 'utf8',
+    :collate       => 'utf8_general_ci'
   }
   }
 }
 }
 ```
 ```
@@ -132,6 +132,7 @@ This will install the backup script and also enable a cronjob to regularly run t
 Kind of the reverse of `backup2s3`. Download a gzip of a MySQL dump file from an S3 bucket, then load it up into a database. Do this for every database given in `node['cfe-mariadb']['db_map']`.
 Kind of the reverse of `backup2s3`. Download a gzip of a MySQL dump file from an S3 bucket, then load it up into a database. Do this for every database given in `node['cfe-mariadb']['db_map']`.
 
 
 This recipe assumes the node is using an EC2 role that can access the given S3 bucket. Otherwise, enter the AWS credentials in `node.default['cfe-mariadb']['reload']['aws_access_key_id']` and `node.default['cfe-mariadb']['reload']['aws_secret_access_key']`.
 This recipe assumes the node is using an EC2 role that can access the given S3 bucket. Otherwise, enter the AWS credentials in `node.default['cfe-mariadb']['reload']['aws_access_key_id']` and `node.default['cfe-mariadb']['reload']['aws_secret_access_key']`.
+
 ## License and Authors
 ## License and Authors
 
 
 Author:: Earth U. (<sysadmin @ chromedia.com>)
 Author:: Earth U. (<sysadmin @ chromedia.com>)

@@ -25,10 +25,15 @@
 #     :db_pass       => 'example_db_password',
 #     :db_pass       => 'example_db_password',
 #     :bak_filename  => 'example_db_name.sql',
 #     :bak_filename  => 'example_db_name.sql',
 #     :bak_maxcopies => 30
 #     :bak_maxcopies => 30
+
 ## Optional:
 ## Optional:
 #     :char_set      => 'utf8',
 #     :char_set      => 'utf8',
 #     :collate       => 'utf8_general_ci',
 #     :collate       => 'utf8_general_ci',
-#     :bak_encrypted => false
+#     :bak_encrypted => false,
+
+## Whether to include in backup script, and reload DB data during Chef run:
+#     :backup => true,
+#     :reload => true
 #   }
 #   }
 # }
 # }
 default['cfe-mariadb']['db_map'] = {}
 default['cfe-mariadb']['db_map'] = {}
@@ -68,6 +73,9 @@ default['cfe-mariadb']['backup']['logrotate']['options']  = %w{
   notifempty
   notifempty
 }
 }
 
 
+default['cfe-mariadb']['reload']['file_stamp'] =
+  "#{node['mariadb']['configuration']['path']}/reloaded.stamp"
+
 # Optional attributes for recipe 'reload_from_s3' only
 # Optional attributes for recipe 'reload_from_s3' only
 # (Usually used during testing)
 # (Usually used during testing)
 # Recommend: use EC2 instances with proper S3 access roles and 
 # Recommend: use EC2 instances with proper S3 access roles and 

@@ -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.4.1'
+version          '0.5.0'
 
 
 {
 {
   'mariadb'         => '0.3.1',
   'mariadb'         => '0.3.1',

@@ -25,70 +25,70 @@ package 'gzip'
 include_recipe 'openssl::upgrade'
 include_recipe 'openssl::upgrade'
 include_recipe 'awscli'
 include_recipe 'awscli'
 
 
-tmp_dir = ::File.join(Chef::Config[:file_cache_path], 'db_dumps')
 manual_creds = node['cfe-mariadb'].has_key?('reload') &&
 manual_creds = node['cfe-mariadb'].has_key?('reload') &&
                node['cfe-mariadb']['reload'].has_key?('aws_access_key_id')
                node['cfe-mariadb']['reload'].has_key?('aws_access_key_id')
 
 
+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"
 
 
-file priv_key_file do
-  content node['cfe-mariadb']['encrypt']['priv_key'] || ''
-  mode      0600
-  owner     'root'
-  group     'root'
-  sensitive true
-  only_if   "test -d #{tmp_dir} || mkdir -p #{tmp_dir}"
-end
-
-node['cfe-mariadb']['db_map'].each do |dbx|
+unless ::File.exist?(node['cfe-mariadb']['reload']['file_stamp'])
+  directory(tmp_dir) { recursive true }
 
 
-  if dbx.is_a?(Array)
-    dbx_name = dbx[0]
-    dbx = dbx[1]
-  else
-    dbx_name = dbx[:db_name]
+  file priv_key_file do
+    mode      0600
+    content   node['cfe-mariadb']['encrypt']['priv_key'] || ''
+    sensitive true
   end
   end
 
 
-  keyname  = "#{dbx[:bak_filename]}.gz#{dbx[:bak_encrypted] ? '.enc' : ''}"
-  filepath = "#{tmp_dir}/#{dbx[:bak_filename]}"
-
-  awscli_s3_file "#{tmp_dir}/#{keyname}" do
-    region   node['cfe-mariadb']['s3_region']
-    bucket   node['cfe-mariadb']['s3_bucket']
-    key      keyname
-    only_if  "test -d #{tmp_dir} || mkdir -p #{tmp_dir}"
-    if manual_creds
-      aws_access_key_id     node['cfe-mariadb']['reload']['aws_access_key_id']
-      aws_secret_access_key node['cfe-mariadb']['reload']['aws_secret_access_key']
+  node['cfe-mariadb']['db_map'].each do |dbx|
+
+    if dbx.is_a?(Array)
+      dbx_name = dbx[0]
+      dbx = dbx[1]
+    else
+      dbx_name = dbx[:db_name]
     end
     end
-  end
 
 
-  execute "decrypt_#{filepath}.gz.enc" do
-    command  "openssl smime -decrypt -binary -inkey #{priv_key_file} "\
-             "-in #{filepath}.gz.enc -out #{filepath}.gz -inform DEM"
-    only_if  { ::File.exist?("#{filepath}.gz.enc") }
-    notifies :delete, "file[#{filepath}.gz.enc]"
-  end
+    unless dbx.has_key?(:reload) && dbx[:reload] == false
+      keyname  = "#{dbx[:bak_filename]}.gz#{dbx[:bak_encrypted] ? '.enc' : ''}"
+      filepath = "#{tmp_dir}/#{dbx[:bak_filename]}"
 
 
-  execute "gzip -d #{filepath}.gz"
+      awscli_s3_file "#{tmp_dir}/#{keyname}" do
+        region node['cfe-mariadb']['s3_region']
+        bucket node['cfe-mariadb']['s3_bucket']
+        key    keyname
+        if manual_creds
+          aws_access_key_id     node['cfe-mariadb']['reload']['aws_access_key_id']
+          aws_secret_access_key node['cfe-mariadb']['reload']['aws_secret_access_key']
+        end
+      end
 
 
-  execute "reload_#{filepath}" do
-    command   "mysql -h #{node['mariadb']['mysqld']['bind_address']} "\
-              "-P #{node['mariadb']['mysqld']['port']} -u #{dbx[:db_user]} "\
-              "-p'#{dbx[:db_pass]}' -D #{dbx_name} < #{filepath}"
-    notifies  :delete, "file[#{filepath}]"
-    sensitive true
-  end
+      execute "decrypt_#{filepath}.gz.enc" do
+        command  "openssl smime -decrypt -binary -inkey #{priv_key_file} "\
+                 "-in #{filepath}.gz.enc -out #{filepath}.gz -inform DEM"
+        only_if  { ::File.exist?("#{filepath}.gz.enc") }
+        notifies :delete, "file[#{filepath}.gz.enc]"
+      end
 
 
-  file "#{filepath}.gz.enc" do
-    action :nothing
-  end
+      execute "gzip -d #{filepath}.gz"
+
+      execute "reload_#{filepath}" do
+        command   "mysql -h #{node['mariadb']['mysqld']['bind_address']} "\
+                  "-P #{node['mariadb']['mysqld']['port']} "\
+                  "-u #{dbx[:db_user]} -p'#{dbx[:db_pass]}' "\
+                  "-D #{dbx_name} < #{filepath}"
+        notifies  :delete, "file[#{filepath}]"
+        sensitive true
+      end
 
 
-  file filepath do
-    action :nothing
+      file("#{filepath}.gz.enc") { action :nothing }
+      file(filepath) { action :nothing }
+
+      file node['cfe-mariadb']['reload']['file_stamp'] do
+        content %x{ date +"%FT%T" }
+      end
+    end
   end
   end
-end
 
 
-file priv_key_file do
-  action :delete
+  file(priv_key_file) { action :delete }
 end
 end

@@ -18,6 +18,7 @@
 # limitations under the License.
 # limitations under the License.
 #
 #
 
 
+# [DEPRECATED]
 # This recipe is just here for backward-compatibility reasons.
 # This recipe is just here for backward-compatibility reasons.
 # The previous backups scripts create .tar.gz files, instead of .gz, so
 # The previous backups scripts create .tar.gz files, instead of .gz, so
 # this recipe is here to get .tar.gz backups.
 # this recipe is here to get .tar.gz backups.

@@ -115,10 +115,12 @@ upload_to_s3() {
 <%   else -%>
 <%   else -%>
 <%     db_name = db[:db_name] -%>
 <%     db_name = db[:db_name] -%>
 <%   end -%>
 <%   end -%>
+<%   unless db.has_key?(:backup) && db[:backup] == false -%>
 export_db <%= db_name %> <%= db[:db_user] %> '<%= db[:db_pass] %>' <%= db[:bak_filename] %>
 export_db <%= db_name %> <%= db[:db_user] %> '<%= db[:db_pass] %>' <%= db[:bak_filename] %>
 compress_backup_file <%= db[:bak_filename] %>
 compress_backup_file <%= db[:bak_filename] %>
-<%   if db[:bak_encrypted] -%>
+<%     if db[:bak_encrypted] -%>
 encrypt_file <%= db[:bak_filename] %>.gz
 encrypt_file <%= db[:bak_filename] %>.gz
+<%     end -%>
 <%   end -%>
 <%   end -%>
 <% end -%>
 <% end -%>
 
 
@@ -131,9 +133,11 @@ encrypt_file <%= db[:bak_filename] %>.gz
 <%   else -%>
 <%   else -%>
 <%     bfname = "#{db[:bak_filename]}.gz" -%>
 <%     bfname = "#{db[:bak_filename]}.gz" -%>
 <%   end -%>
 <%   end -%>
+<%   unless db.has_key?(:backup) && db[:backup] == false -%>
 increment_backup_names <%= bfname %> <%= db[:bak_maxcopies] %>
 increment_backup_names <%= bfname %> <%= db[:bak_maxcopies] %>
 upload_to_s3 <%= bfname %>
 upload_to_s3 <%= bfname %>
 
 
-<%  end -%>
+<%   end -%>
+<% end -%>
 rm "$tmp_file"
 rm "$tmp_file"
 echo "$(date) : Done."
 echo "$(date) : Done."