Bump to v0.2.1

+# 0.2.1
+
+Recipe reload_from_s3 now properly downloads a .gz file, instead of .tar.gz.
+
 # 0.2.0
 # 0.2.0
 
 
 Use MariaDB 10.0
 Use MariaDB 10.0

@@ -115,7 +115,7 @@ This will install the backup script and also enable a cronjob to regularly run t
 
 
 ### cfe-mariadb::reload_from_s3
 ### cfe-mariadb::reload_from_s3
 
 
-Kind of the reverse of `backup2s3`. Download a tarball 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

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

@@ -18,7 +18,7 @@
 # limitations under the License.
 # limitations under the License.
 #
 #
 
 
-# Download a tarball of a MySQL dump from an S3 bucket, 
+# Download the gzip of a MySQL dump from an S3 bucket, 
 # then load it up into a (preferably empty) database.
 # then load it up into a (preferably empty) database.
 
 
 include_recipe 'awscli'
 include_recipe 'awscli'
@@ -37,25 +37,24 @@ node['cfe-mariadb']['db_map'].each do |dbx|
   end
   end
 
 
   filesql = "#{tmp_dir}/#{dbx[:bak_filename]}"
   filesql = "#{tmp_dir}/#{dbx[:bak_filename]}"
-  filetgz = "#{filesql}.tar.gz"
+  filegz  = "#{filesql}.gz"
 
 
-  awscli_s3_file filetgz do
+  awscli_s3_file filegz do
     region   node['cfe-mariadb']['s3_region']
     region   node['cfe-mariadb']['s3_region']
     bucket   node['cfe-mariadb']['s3_bucket']
     bucket   node['cfe-mariadb']['s3_bucket']
-    key      "#{dbx[:bak_filename]}.tar.gz"
+    key      "#{dbx[:bak_filename]}.gz"
     if manual_creds
     if manual_creds
       aws_access_key_id     node['cfe-mariadb']['reload']['aws_access_key_id']
       aws_access_key_id     node['cfe-mariadb']['reload']['aws_access_key_id']
       aws_secret_access_key node['cfe-mariadb']['reload']['aws_secret_access_key']
       aws_secret_access_key node['cfe-mariadb']['reload']['aws_secret_access_key']
     end
     end
     only_if  "test -d #{tmp_dir} || mkdir -p #{tmp_dir}"
     only_if  "test -d #{tmp_dir} || mkdir -p #{tmp_dir}"
-    notifies :run, "execute[untar_#{filetgz}]", :immediately
+    notifies :run, "execute[unpack_#{filegz}]", :immediately
   end
   end
 
 
-  execute "untar_#{filetgz}" do
-    command "tar -xzf #{filetgz} -C #{tmp_dir}/"
-    notifies :delete, "file[#{filetgz}]"
+  execute "unpack_#{filegz}" do
+    command  "gzip -d #{filegz}"
     notifies :run, "execute[reload_#{filesql}]", :immediately
     notifies :run, "execute[reload_#{filesql}]", :immediately
-    action  :nothing
+    action   :nothing
   end
   end
 
 
   execute "reload_#{filesql}" do
   execute "reload_#{filesql}" do
@@ -67,10 +66,6 @@ node['cfe-mariadb']['db_map'].each do |dbx|
     action    :nothing
     action    :nothing
   end
   end
 
 
-  file filetgz do
-    action :nothing
-  end
-
   file filesql do
   file filesql do
     action :nothing
     action :nothing
   end
   end

+#
+# Author:: Earth U (<sysadmin @ chromedia.com>)
+# Cookbook Name:: cfe-mariadb
+# Recipe:: reload_tar_from_s3
+#
+# Copyright 2016, Chromedia Far East, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This recipe is just here for backward-compatibility reasons.
+# The previous backups scripts create .tar.gz files, instead of .gz, so
+# this recipe is here to get .tar.gz backups.
+
+# Download a tarball of a MySQL dump from an S3 bucket, 
+# then load it up into a (preferably empty) database.
+
+include_recipe 'awscli'
+
+tmp_dir = ::File.join(Chef::Config[:file_cache_path], 'db_dumps')
+manual_creds = node['cfe-mariadb'].has_key?('reload') &&
+               node['cfe-mariadb']['reload'].has_key?('aws_access_key_id')
+
+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
+
+  filesql = "#{tmp_dir}/#{dbx[:bak_filename]}"
+  filetgz = "#{filesql}.tar.gz"
+
+  awscli_s3_file filetgz do
+    region   node['cfe-mariadb']['s3_region']
+    bucket   node['cfe-mariadb']['s3_bucket']
+    key      "#{dbx[:bak_filename]}.tar.gz"
+    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
+    only_if  "test -d #{tmp_dir} || mkdir -p #{tmp_dir}"
+    notifies :run, "execute[untar_#{filetgz}]", :immediately
+  end
+
+  execute "untar_#{filetgz}" do
+    command "tar -xzf #{filetgz} -C #{tmp_dir}/"
+    notifies :delete, "file[#{filetgz}]"
+    notifies :run, "execute[reload_#{filesql}]", :immediately
+    action  :nothing
+  end
+
+  execute "reload_#{filesql}" 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} < #{filesql}"
+    notifies  :delete, "file[#{filesql}]"
+    sensitive true
+    action    :nothing
+  end
+
+  file filetgz do
+    action :nothing
+  end
+
+  file filesql do
+    action :nothing
+  end
+end

@@ -6,6 +6,10 @@
 
 
 set -e
 set -e
 
 
+suffix=.backup_db_to_s3
+[ -f /tmp/*"$suffix" ] && exit 200
+tmp_file=$( mktemp --suffix "$suffix" )
+
 <% bak_dir = "#{Chef::Config[:file_cache_path]}/backup_db_to_s3" -%>
 <% bak_dir = "#{Chef::Config[:file_cache_path]}/backup_db_to_s3" -%>
 bak_dir=<%= bak_dir %>
 bak_dir=<%= bak_dir %>
 db_host=<%= @db_ip %>
 db_host=<%= @db_ip %>
@@ -113,4 +117,5 @@ increment_backup_names <%= db[:bak_filename] %> <%= db[:bak_maxcopies] %>
 upload_to_s3 <%= db[:bak_filename] %>
 upload_to_s3 <%= db[:bak_filename] %>
 
 
 <% end -%>
 <% end -%>
+rm "$tmp_file"
 echo "$(date) : Done."
 echo "$(date) : Done."