Version v0.1.4

+## 0.1.4 - 2016-12-22
+### Changed
+- Attribute node['cookbook-zabbix']['agent']['server_ip'] should now be in a secret data bag item named 'cfe-server-secret'.
+### Added
+- Updated README.
+
 ## 0.1.3 - 2016-12-22
 ## 0.1.3 - 2016-12-22
 ### Added
 ### Added
 - Forgot to add 'cookbook-zabbix::agent_package' as part of the run chain.
 - Forgot to add 'cookbook-zabbix::agent_package' as part of the run chain.

@@ -99,18 +99,26 @@ Tested on Ubuntu 14.04.
     <td>Whether or not to include the recipe 'cfe-nginx-php-fpm::nginx'.</td>
     <td>Whether or not to include the recipe 'cfe-nginx-php-fpm::nginx'.</td>
     <td><tt>true</tt></td>
     <td><tt>true</tt></td>
   </tr>
   </tr>
+  <tr>
+    <td><tt>['cfe-server']['monitor']['include_zabbix_agent']</tt></td>
+    <td>Boolean</td>
+    <td>Whether or not to include the recipe 'cookbook-zabbix::agent_package'.</td>
+    <td><tt>true</tt></td>
+  </tr>
 </table>
 </table>
 
 
 ## Usage
 ## Usage
 
 
 ### Secret Data Bag
 ### Secret Data Bag
 
 
-A secret data bag named either `prod`, `staging`, or `dev` has to be created. In it should be an item named `cfe-server-secret` that contains two properties: `iptables_ssh_ports` and `iptables_add_rules`.
+A secret data bag named either `prod`, `staging`, or `dev` has to be created. In it should be an item named `cfe-server-secret` that contains the following properties:
 
 
 `iptables_ssh_ports` is an array that contains ports to be used by sshd.
 `iptables_ssh_ports` is an array that contains ports to be used by sshd.
 
 
 `iptables_add_rules` is an array of hashes that denote additional FILTER iptables rules to be created on the server. The hashes must conform to the format required by the cookbook `cfe-simple-iptables`.
 `iptables_add_rules` is an array of hashes that denote additional FILTER iptables rules to be created on the server. The hashes must conform to the format required by the cookbook `cfe-simple-iptables`.
 
 
+`ip_zabbix` is the IP addres of the Zabbix Monitoring Server.
+
 Example:
 Example:
 ```json
 ```json
 {
 {
@@ -122,7 +130,8 @@ Example:
       "rule"  : "--proto tcp --dport 8080",
       "rule"  : "--proto tcp --dport 8080",
       "weight": 25
       "weight": 25
     }
     }
-  ]
+  ],
+  "ip_zabbix": "1.2.3.4"
 }
 }
 ```
 ```
 
 

@@ -20,11 +20,12 @@
 
 
 cb = 'cfe-server'
 cb = 'cfe-server'
 
 
-# Secret data bag stuff
-#
-# Necessary secret data bag key/s:
-#   iptables_ssh_ports
-#   iptables_add_rules
+## Secret data bag stuff
+##
+## Necessary secret data bag key/s:
+##   iptables_ssh_ports
+##   iptables_add_rules
+##   ip_zabbix
 
 
 databag =
 databag =
   case node.chef_environment
   case node.chef_environment
@@ -157,3 +158,5 @@ rules_filter2 = [
 
 
 default['cfe-simple-iptables']['filter'] =
 default['cfe-simple-iptables']['filter'] =
   rules_filter1 + rules_add + rules_filter2
   rules_filter1 + rules_add + rules_filter2
+
+default['cookbook-zabbix']['agent']['server_ip'] = secret['ip_zabbix']

@@ -4,7 +4,7 @@ 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.3'
+version          '0.1.4'
 
 
 %w{
 %w{
   cfe-users           cfe-mariadb 
   cfe-users           cfe-mariadb