Create version 0.1.0 of cookbook

+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+pkg/
+
+# Berkshelf
+.vagrant
+/cookbooks
+Berksfile.lock
+
+# Bundler
+Gemfile.lock
+bin/*
+.bundle/*
+
+.kitchen/
+.kitchen.local.yml

+---
+driver:
+  name: ec2
+  aws_ssh_key_id: cfe_stg_20160222
+  security_group_ids: ["sg-7f6fda18"]
+  region: us-west-2
+  availability_zone: b
+  subnet_id: subnet-d530d8b1
+  instance_type: t2.micro
+  associate_public_ip: true
+  require_chef_omnibus: true
+  shared_credentials_profile: earth
+
+provisioner:
+  name: chef_solo
+
+platforms:
+  - name: ubuntu-14.04
+    driver:
+      image_id: ami-3d2cce5d
+    transport:
+      username: ubuntu
+      ssh_key: ~/.ssh/cfe_stg_20160222.pem
+
+suites:
+  - name: default
+    run_list:
+      - recipe[cfe-mariadb::default]
+      - recipe[cfe-mariadb::backup2s3]
+    attributes:

-source 'https://supermarket.getchef.com'
+source "https://supermarket.chef.io"
 
-cookbook 'mariadb', '~> 0.2.12'
-cookbook 'mysql2_chef_gem', '~> 1.0.2'
-cookbook 'database', '~> 4.0.9'
-cookbook 'awscli', '~> 1.0.1'
+metadata

+# 0.1.0
+
+Initial release of cfe-mariadb

+source 'https://rubygems.org'
+
+gem "test-kitchen"
+gem "kitchen-ec2"
+gem "ec2"

+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   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.

-The cfe-mariadb Cookbook.
+# cfe-mariadb-cookbook
+
+This installs MariaDB by default and initiates databases and users. It can also install a script that performs a backup of all those databases into a designated S3 bucket. 
+
+
+The server is assumed to be using an IAM role with S3 bucket read/write access, instead of a physical credentials file.
+
+## Supported Platforms
+
+Ubuntu 14.04
+
+## Attributes
+
+<table>
+  <tr>
+    <th>Key</th>
+    <th>Type</th>
+    <th>Description</th>
+    <th>Default</th>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['db_map']</tt></td>
+    <td>Hash</td>
+    <td>A hash/array of hashes that enumerate the DB names, users, passwords, etc. of all databases to be set up. Please see the default attributes file for examples.</td>
+    <td><tt>{}</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['replication']</tt></td>
+    <td>Boolean</td>
+    <td>Whether replication is enabled or not</td>
+    <td><tt>false</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['s3_region']</tt></td>
+    <td>String</td>
+    <td>AWS S3 region</td>
+    <td><tt>'us-east-1'</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['s3_bucket']</tt></td>
+    <td>String</td>
+    <td>AWS S3 bucket name</td>
+    <td><tt>'example-bucket'</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['cron']['min']</tt></td>
+    <td>String</td>
+    <td>The backup cronjob 'minute' value</td>
+    <td><tt>'0'</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['cron']['hour']</tt></td>
+    <td>String</td>
+    <td>The backup cronjob 'hour' value</td>
+    <td><tt>'0'</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['cron']['day']</tt></td>
+    <td>String</td>
+    <td>The backup cronjob 'day of month' value</td>
+    <td><tt>'*'</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['cron']['mon']</tt></td>
+    <td>String</td>
+    <td>The backup cronjob 'month' value</td>
+    <td><tt>'*'</tt></td>
+  </tr>
+  <tr>
+    <td><tt>['cfe-mariadb']['backup']['cron']['wday']</tt></td>
+    <td>String</td>
+    <td>The backup cronjob 'day of week' value</td>
+    <td><tt>'*'</tt></td>
+  </tr>
+</table>
+
+## Usage
+
+### cfe-mariadb::default
+
+Include `cfe-mariadb` in your node's `run_list`:
+
+```json
+{
+  "run_list": [
+    "recipe[cfe-mariadb]"
+  ]
+}
+```
+
+### cfe-mariadb::backup2s3
+
+This will install the backup script and also enable a cronjob to regularly run that script.
+
+```json
+{
+  "run_list": [
+    "recipe[cfe-mariadb]",
+    "recipe[cfe-mariadb::backup2s3]"
+  ]
+}
+```
+## License and Authors
+
+Author:: Earth U. (<sysadmin@chromedia.com>)

+# encoding: utf-8
+
+require 'bundler'
+require 'bundler/setup'
+require 'berkshelf/thor'
+
+begin
+  require 'kitchen/thor_tasks'
+  Kitchen::ThorTasks.new
+rescue LoadError
+  puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
+end

+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = '2'
+
+Vagrant.require_version '>= 1.5.0'
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  # All Vagrant configuration is done here. The most common configuration
+  # options are documented and commented below. For a complete reference,
+  # please see the online documentation at vagrantup.com.
+
+  config.vm.hostname = 'cfe-mariadb-berkshelf'
+
+  # Set the version of chef to install using the vagrant-omnibus plugin
+  # NOTE: You will need to install the vagrant-omnibus plugin:
+  #
+  #   $ vagrant plugin install vagrant-omnibus
+  #
+  if Vagrant.has_plugin?("vagrant-omnibus")
+    config.omnibus.chef_version = 'latest'
+  end
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  # If this value is a shorthand to a box in Vagrant Cloud then
+  # config.vm.box_url doesn't need to be specified.
+  config.vm.box = 'chef/ubuntu-14.04'
+
+
+  # Assign this VM to a host-only network IP, allowing you to access it
+  # via the IP. Host-only networks can talk to the host machine as well as
+  # any other machines on the same network, but cannot be accessed (through this
+  # network interface) by any external networks.
+  config.vm.network :private_network, type: 'dhcp'
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider :virtualbox do |vb|
+  #   # Don't boot with headless mode
+  #   vb.gui = true
+  #
+  #   # Use VBoxManage to customize the VM. For example to change memory:
+  #   vb.customize ["modifyvm", :id, "--memory", "1024"]
+  # end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # The path to the Berksfile to use with Vagrant Berkshelf
+  # config.berkshelf.berksfile_path = "./Berksfile"
+
+  # Enabling the Berkshelf plugin. To enable this globally, add this configuration
+  # option to your ~/.vagrant.d/Vagrantfile file
+  config.berkshelf.enabled = true
+
+  # An array of symbols representing groups of cookbook described in the Vagrantfile
+  # to exclusively install and copy to Vagrant's shelf.
+  # config.berkshelf.only = []
+
+  # An array of symbols representing groups of cookbook described in the Vagrantfile
+  # to skip installing and copying to Vagrant's shelf.
+  # config.berkshelf.except = []
+
+  config.vm.provision :chef_solo do |chef|
+    chef.json = {
+      mysql: {
+        server_root_password: 'rootpass',
+        server_debian_password: 'debpass',
+        server_repl_password: 'replpass'
+      }
+    }
+
+    chef.run_list = [
+      'recipe[cfe-mariadb::default]'
+    ]
+  end
+end

 #
+# Author:: Earth U (<sysadmin@chromedia.com>)
 # Cookbook Name:: cfe-mariadb
 # Attributes:: default
 #
-# Copyright 2016, Chromedia
+# Copyright 2016, Chromedia Far East, Inc.
 #
-# All rights reserved - Do Not Redistribute
+# 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.
 #
 
 ## The 'db_map' should contain this format:
@@ -19,26 +30,48 @@
 #     :collate  => 'latin1_swedish_ci'
 #   }
 # }
-default['cfe-mariadb']['db_map']      = {}
+default['cfe-mariadb']['db_map'] = {
+  'example_db' => {
+    :db_user       => 'example_user',
+    :db_pass       => 'secret',
+    :bak_filename  => 'example_db.sql',
+    :bak_maxcopies => 30
+  }
+}
+
 # Make sure to set replication on only when necessary
 default['cfe-mariadb']['replication'] = false
 
-default['cfe-mariadb']['backup']['s3_region']     = 'us-east-1'
-default['cfe-mariadb']['backup']['s3_bucket']     = 'example-bucket'
-default['cfe-mariadb']['backup']['aws_bin']       = '/use/local/bin/aws',
-default['cfe-mariadb']['backup']['mysqldump_bin'] = '/usr/bin/mysqldump',
+default['cfe-mariadb']['backup']['s3_region'] = 'us-east-1'
+default['cfe-mariadb']['backup']['s3_bucket'] = 'example-bucket'
+
+if node['platform'] == 'ubuntu' and node['platform_version'].to_f == 14.04
+  default['cfe-mariadb']['backup']['aws_bin']       = '/usr/local/bin/aws'
+  default['cfe-mariadb']['backup']['mysqldump_bin'] = '/usr/bin/mysqldump'
+else
+  # Haven't tested on other platforms yet, so same as above for now.
+  default['cfe-mariadb']['backup']['aws_bin']       = '/usr/local/bin/aws'
+  default['cfe-mariadb']['backup']['mysqldump_bin'] = '/usr/bin/mysqldump'
+end
 # Path to directory where the backup script should be placed
-default['cfe-mariadb']['backup']['script_dir']    = ::File.join(
+default['cfe-mariadb']['backup']['script_dir'] = ::File.join(
   node['mariadb']['configuration']['path'], 'scripts'
 )
+
 default['cfe-mariadb']['backup']['cron']['min']    = '0'
 default['cfe-mariadb']['backup']['cron']['hour']   = '0'
 default['cfe-mariadb']['backup']['cron']['day']    = '*'
 default['cfe-mariadb']['backup']['cron']['mon']    = '*'
 default['cfe-mariadb']['backup']['cron']['wday']   = '*'
-default['cfe-mariadb']['backup']['cron']['mailto'] = ''
+default['cfe-mariadb']['backup']['cron']['mailto'] = "''" # Empty single quotes
+
+# Basic options for logrotate
+default['cfe-mariadb']['backup']['logrotate']['conf_dir'] = '/etc/logrotate.d'
+default['cfe-mariadb']['backup']['logrotate']['options']  = [
+  'weekly', 'rotate 12', 'missingok', 'compress', 'notifempty'
+]
 
-default['mariadb']['server_root_password']   = 'password'
+default['mariadb']['server_root_password']   = 'secretpassword'
 default['mariadb']['mysqld']['bind_address'] = '127.0.0.1'
 default['mariadb']['mysqld']['port']         = '3306'
 default['mariadb']['install']['type']        = 'package'
@@ -46,7 +79,7 @@ default['mariadb']['install']['version']     = '5.5'
 default['mariadb']['forbid_remote_root']     = true
 # io_capacity has to be roughly the IO capacity of the EC2 instance.
 # buffer_pool_size can be increased to 75% (0.75) of RAM if dedicated server.
-default['mariadb']['innodb']['io_capacity']      = '600'
+default['mariadb']['innodb']['io_capacity']      = '30'
 default['mariadb']['innodb']['buffer_pool_size'] =
   ( %x(free -m).split(' ')[7].to_i * 0.5 ).round.to_s
 
@@ -55,7 +88,6 @@ default['mariadb']['innodb']['buffer_pool_size'] =
 ## the following is possible in the attributes file:
 ##
 # secret = Chef::EncryptedDataBagItem.load(
-#   node['cfe-gitlab']['data_bag'],
-#   node['cfe-gitlab']['data_bag_item_secret']
+#   my_data_bag, my_secret_data_bag_item
 # )
-# default['cfe-gitlab']['some_prop'] = secret['db_pass']
+# default['cfe-mariadb']['some_prop'] = secret['db_password']

+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml

 name             'cfe-mariadb'
-maintainer       'Chromedia'
+maintainer       'Chromedia Far East, Inc.'
 maintainer_email 'sysadmin@chromedia.com'
-license          'All rights reserved'
+license          'Apache License'
 description      'Simplifies setup of MariaDB in Chromedia.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version          '0.1.0'
@@ -10,7 +10,8 @@ version          '0.1.0'
   'mariadb'         => '0.2.12',
   'mysql2_chef_gem' => '1.0.2',
   'database'        => '4.0.9',
-  'awscli'          => '1.0.1'
+  'awscli'          => '1.0.1',
+  'cron'            => '1.7.4'
 }.each { |cb, ver| depends cb, '~> ' + ver }
 
 supports 'ubuntu', '>= 14.04'

 #
+# Author:: Earth U (<sysadmin@chromedia.com>)
 # Cookbook Name:: cfe-mariadb
 # Recipe:: backup2s3
 #
-# Copyright 2016, Chromedia
+# Copyright 2016, Chromedia Far East, Inc.
 #
-# All rights reserved - Do Not Redistribute
+# 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.
 #
 
 # Sets up the shell script that backs up the databases
 # and uploads them to a S3 bucket.
 # Also sets up the cron job to regularly run this script.
 
-# TODO: set up logrotate
 include_recipe 'awscli'
 
 md   = node['cfe-mariadb']
 mdb  = md['backup']
 mdbc = mdb['cron']
+mdbl = mdb['logrotate']
 
-template "#{scr_dir}/backup_db_to_s3" do
+template "#{mdb['script_dir']}/backup_db_to_s3" do
   only_if "test -d #{mdb['script_dir']} || mkdir -p #{mdb['script_dir']}"
   variables(
     :db_map        => md['db_map'],
@@ -31,8 +42,11 @@ template "#{scr_dir}/backup_db_to_s3" do
   )
 end
 
-cron 'backup_db_to_s3' do
-  command "bash #{scr_dir}/backup_db_to_s3"
+# Chef built-in resource 'cron' seems to have a problem with
+# the syntax here. But they suggest using 'cron_d', instead, from
+# the cron cookbook (https://docs.chef.io/resource_cron.html).
+cron_d 'backup_db_to_s3' do
+  command "bash #{mdb['script_dir']}/backup_db_to_s3"
   minute  mdbc['min']
   hour    mdbc['hour']
   day     mdbc['day']
@@ -41,3 +55,13 @@ cron 'backup_db_to_s3' do
   mailto  mdbc['mailto']
   path    '/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin'
 end
+
+package 'logrotate'
+
+template "#{mdbl['conf_dir']}/backup_db_to_s3" do
+  source 'backup_db_to_s3_logrotate.erb'
+  only_if "test -d #{mdbl['conf_dir']} || mkdir -p #{mdbl['conf_dir']}"
+  variables(
+    :opts => mdbl['options']
+  )
+end

 #
+# Author:: Earth U (<sysadmin@chromedia.com>)
 # Cookbook Name:: cfe-mariadb
 # Recipe:: default
 #
-# Copyright 2016, Chromedia
+# Copyright 2016, Chromedia Far East, Inc.
 #
-# All rights reserved - Do Not Redistribute
+# 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.
 #
 
 # Some notes:
@@ -43,7 +54,14 @@ con = {
   :username => 'root',
   :password => node['mariadb']['server_root_password']
 }
-node.default['cfe-mariadb']['db_map'].each do |dbx_name, dbx|
+node.default['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
 
   mysql_database dbx_name do
     connection con

@@ -94,12 +94,19 @@ upload_to_s3() {
 }
 
 # First, perform mysqldump on each database.
-<% @db_map.each do |db_name, db| -%>
+<% @db_map.each do |db| -%>
+<%  if db.is_a?(Array) -%>
+<%    db_name = db[0] -%>
+<%    db = db[1] -%>
+<%  else -%>
+<%    db_name = db[:db_name] -%>
+<%  end -%>
 export_db <%= db_name %> <%= db[:db_user] %> '<%= db[:db_pass] %>' <%= db[:bak_filename] %>
 <% end -%>
 
 # Then compress and upload the backup files one by one.
-<% @db_map.each do |db_name, db| -%>
+<% @db_map.each do |db| -%>
+<%  if db.is_a?(Array) then db = db[1] end -%>
 compress_backup_file <%= db[:bak_filename] %>
 increment_backup_names <%= db[:bak_filename] %> <%= db[:bak_maxcopies] %>
 upload_to_s3 <%= db[:bak_filename] %>

+/var/log/backup_db_to_s3/*.log {
+<% @opts.each do |str| -%>
+  <%= str %>
+<% end -%>
+}