Version 0.2.0. Made MariaDB client installation optional. Add dependency to cfe-mongodb.

@@ -9,8 +9,6 @@ driver:
   associate_public_ip: true
   associate_public_ip: true
   require_chef_omnibus: 12.12.15
   require_chef_omnibus: 12.12.15
   shared_credentials_profile: earth
   shared_credentials_profile: earth
-  aws_ssh_key_id: cfe_stg_20160222
-  iam_profile_name: CFE_ops-test
 
 
 provisioner:
 provisioner:
   name: chef_zero
   name: chef_zero
@@ -18,10 +16,10 @@ provisioner:
 platforms:
 platforms:
   - name: ubuntu-14.04
   - name: ubuntu-14.04
     driver:
     driver:
-      image_id: ami-a24598c2
+      image_id: ami-xxx
     transport:
     transport:
       username: ubuntu
       username: ubuntu
-      ssh_key: ~/.ssh/cfe_stg_20160222.pem
+      ssh_key: ~/.ssh/xxx.pem
 
 
 suites:
 suites:
   - name: default
   - name: default

@@ -4,6 +4,7 @@ metadata
 
 
 cookbook 'cfe-users', git: 'https://gitlab.chromedia.com/ops/cfe-users.git', tag: 'v0.1.1'
 cookbook 'cfe-users', git: 'https://gitlab.chromedia.com/ops/cfe-users.git', tag: 'v0.1.1'
 cookbook 'cfe-mariadb', git: 'https://gitlab.chromedia.com/ops/cfe-mariadb.git', tag: 'v0.5.1'
 cookbook 'cfe-mariadb', git: 'https://gitlab.chromedia.com/ops/cfe-mariadb.git', tag: 'v0.5.1'
+cookbook 'cfe-mongodb', git: 'https://gitlab.chromedia.com/ops/cfe-mongodb.git', tag: 'v0.1.0'
 cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3.git', tag: 'v0.4.0'
 cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3.git', tag: 'v0.4.0'
 cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.2'
 cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.2'
 cookbook 'cfe-simple-iptables', git: 'https://gitlab.chromedia.com/ops/cfe-simple-iptables.git', tag: 'v0.1.0'
 cookbook 'cfe-simple-iptables', git: 'https://gitlab.chromedia.com/ops/cfe-simple-iptables.git', tag: 'v0.1.0'

+## 0.2.0 - 2017-01-04
+### Added
+- Add dependency to 'cfe-mongodb' (removed 'mongodb3' direct dependency).
+- Add attribute that makes MariaDB client installation optional.
+
 ## 0.1.4 - 2016-12-22
 ## 0.1.4 - 2016-12-22
 ### Changed
 ### Changed
 - Attribute node['cookbook-zabbix']['agent']['server_ip'] should now be in a secret data bag item named 'cfe-server-secret'.
 - Attribute node['cookbook-zabbix']['agent']['server_ip'] should now be in a secret data bag item named 'cfe-server-secret'.

@@ -18,10 +18,16 @@ Tested on Ubuntu 14.04.
   <tr>
   <tr>
     <td><tt>['cfe-server']['db']['mariadb']['install']</tt></td>
     <td><tt>['cfe-server']['db']['mariadb']['install']</tt></td>
     <td>Boolean</td>
     <td>Boolean</td>
-    <td>Whether or not to install MariaDB server.</td>
+    <td>Whether or not to install MariaDB server recipe.</td>
     <td><tt>false</tt></td>
     <td><tt>false</tt></td>
   </tr>
   </tr>
   <tr>
   <tr>
+    <td><tt>['cfe-server']['db']['include_mariadb']</tt></td>
+    <td>Boolean</td>
+    <td>Whether or not to include any of the recipes for MariaDB at all (server, client, backup reloading, and auto-backup scripts).</td>
+    <td><tt>true</tt></td>
+  </tr>
+  <tr>
     <td><tt>['cfe-server']['db']['include_mongodb']</tt></td>
     <td><tt>['cfe-server']['db']['include_mongodb']</tt></td>
     <td>Boolean</td>
     <td>Boolean</td>
     <td>Whether or not to include the recipe `mongodb3`.</td>
     <td>Whether or not to include the recipe `mongodb3`.</td>

@@ -36,8 +36,9 @@ databag =
   end
   end
 secret = Chef::EncryptedDataBagItem.load(databag, "#{cb}-secret")
 secret = Chef::EncryptedDataBagItem.load(databag, "#{cb}-secret")
 
 
+default[cb]['db']['include_mongodb'] = true
+default[cb]['db']['include_mariadb'] = true
 default[cb]['db']['mariadb']['install'] = false
 default[cb]['db']['mariadb']['install'] = false
-default[cb]['db']['include_mongodb']    = true
 
 
 default[cb]['filesystem']['swapfile'] = false
 default[cb]['filesystem']['swapfile'] = false
 default[cb]['filesystem']['swapsize'] = '2G'
 default[cb]['filesystem']['swapsize'] = '2G'

@@ -4,12 +4,12 @@ maintainer_email 'sysadmin@chromedia.com'
 license          'Apache License'
 license          'Apache License'
 description      'Simplifies setting up common Linux servers.'
 description      'Simplifies setting up common Linux servers.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.4'
+version          '0.2.0'
 
 
 %w{
 %w{
   cfe-users           cfe-mariadb 
   cfe-users           cfe-mariadb 
   backup-file2s3      cfe-nginx-php-fpm 
   backup-file2s3      cfe-nginx-php-fpm 
-  cfe-simple-iptables
+  cfe-simple-iptables cfe-mongodb
 
 
   cookbook-letsencrypt cookbook-phpmyadmin
   cookbook-letsencrypt cookbook-phpmyadmin
   cookbook-updater     cookbook-zabbix 
   cookbook-updater     cookbook-zabbix 
@@ -17,7 +17,6 @@ version          '0.1.4'
   depends cb
   depends cb
 end
 end
 
 
-depends 'mongodb3', '~> 5.2.0'
 depends 'composer', '~> 2.5.2'
 depends 'composer', '~> 2.5.2'
 depends 'cron', '~> 1.7.6'
 depends 'cron', '~> 1.7.6'
 
 

@@ -18,16 +18,19 @@
 # limitations under the License.
 # limitations under the License.
 #
 #
 
 
-if node[cookbook_name]['db']['mariadb']['install']
-  include_recipe 'cfe-mariadb'
-else
-  include_recipe 'mariadb::client'
-  include_recipe 'cfe-mariadb::schema'
-end
+if node[cookbook_name]['db']['include_mariadb']
+  if node[cookbook_name]['db']['mariadb']['install']
+    include_recipe 'cfe-mariadb'
+  else
+    include_recipe 'mariadb::client'
+    include_recipe 'cfe-mariadb::schema'
+  end
 
 
-include_recipe 'cfe-mariadb::reload_from_s3'
-include_recipe 'cfe-mariadb::backup2s3'
+  include_recipe 'cfe-mariadb::reload_from_s3'
+  include_recipe 'cfe-mariadb::backup2s3'
+end
 
 
 if node[cookbook_name]['db']['include_mongodb']
 if node[cookbook_name]['db']['include_mongodb']
-  include_recipe 'mongodb3'
+  include_recipe 'cfe-mongodb'
+  include_recipe 'cfe-mongodb::backup2s3'
 end
 end